diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-13 07:36:33 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-17 15:51:18 +0300 |
| commit | 21c1e55cd4ac022144b683bd2e611dba904eaf2a (patch) | |
| tree | 5f101f8a4278385b6dfbde2b80a6e7ac9ca0bade /scp2 | |
| parent | c59bb8162fa13d4ae064a564136d5d7bd8f4a1e1 (diff) | |
Correct the location of the URE unorc in scp2 for OS X
The URE unorc should be in Resources/ure/etc also when constructing an
app bundle from scp2 data.
Change-Id: Id33d20bda0175018b8340c686ae9cd47525cd401
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index ce7bbc50b581..0551e954a39b 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -45,6 +45,7 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, gid_Brand_Dir_Share_Ure, + gid_Brand_Dir_Share_Ure_Etc, gid_Brand_Dir_Share_Ure_Share, gid_Brand_Dir_Share_Glade, gid_Brand_Dir_Share_Labels, @@ -446,6 +447,11 @@ Directory gid_Brand_Dir_Share_Ure DosName = "ure"; End +Directory gid_Brand_Dir_Share_Ure_Etc + ParentID = gid_Brand_Dir_Share_Ure; + DosName = "etc"; +End + Directory gid_Brand_Dir_Share_Ure_Share ParentID = gid_Brand_Dir_Share_Ure; DosName = "share"; diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 1f551ce754f3..01e2cbde0f98 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -160,7 +160,7 @@ End Profile gid_Profile_Dl_Uno_Ini ModuleID = gid_Module_Root_Ure_Hidden; #if defined MACOSX - Dir = gid_Brand_Dir_Share_Ure; + Dir = gid_Brand_Dir_Share_Ure_Etc; #else Dir = SCP2_URE_DL_DIR; #endif |