[Libreoffice-commits] core.git: scp2/source

[Tor Lillqvist]

 scp2/source/ooo/common_brand.scp |    6 ++++++
 scp2/source/ooo/ure.scp          |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 21c1e55cd4ac022144b683bd2e611dba904eaf2a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 13 07:36:33 2014 +0300

    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

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ce7bbc5..0551e95 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 1f551ce7..01e2cbd 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