diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-08-22 08:33:11 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-24 14:21:20 +0100 |
| commit | 95c3996d389c4f91648777726226dddef2c75dc1 (patch) | |
| tree | ad6673d927e522ecd7b9ed898a50f2660507f895 /scp2 | |
| parent | assert on export of ooo59665-1.sxw to odt (diff) | |
| download | core-95c3996d389c4f91648777726226dddef2c75dc1.tar.gz core-95c3996d389c4f91648777726226dddef2c75dc1.zip | |
scp2: EULA to Resources on OS X
Change-Id: I87bbb61884d77729832e4d3f36aca29d6dada277
(cherry picked from commit d701823363236c1976f22dc46116a9b49bf68b24)
(cherry picked from commit 6b70a1059d86f7252daa83716b335f8dcdf452d1)
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 389afafad654..d9d9864ec298 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1289,10 +1289,8 @@ End File gid_Eula_Odt BIN_FILE_BODY; -#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE +#if defined MACOSX Dir = gid_Dir_Bundle_Contents_Resources; -#elif defined MACOSX - Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; #endif |