tweak previous commit hoping it will work on Mac ...

... plus some more fixes:
- also install ure-link on WNT via Package not scp2.
- also disable unorc in scp2 on WNT, otherwise cannot built instset
due to duplicate file.
- slso USE_INTERNAL_RIGHTS so startup.sh is executable.

4 files changed, 17 insertions, 24 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 3dedd0b63d00..59918cba6ea1 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -92,8 +92,7 @@ Module gid_Module_Root_Brand
 	     gid_Apache_Notice);
 #if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Unixlinks = (gid_Brand_Unixlink_Program,
-                 gid_Brand_Unixlink_Unopkg,
-                 gid_Brand_Unixlink_Urelibs);
+                 gid_Brand_Unixlink_Unopkg);
 #endif
 End
 
@@ -466,14 +465,6 @@ End
 // UnixLinks
 
 #if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Unixlink gid_Brand_Unixlink_Urelibs
-    Dir = gid_Brand_Dir_Program;
-    Name = "urelibs";
-    Target = "../ure-link/lib";
-End
-#endif
-
-#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 Unixlink gid_Brand_Unixlink_Program
     BIN_FILE_BODY;
     Dir = gid_Dir_Bundle_Contents;
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 96c7aa97bb28..c37134b1e80c 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -92,15 +92,6 @@ End
 
 #endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
-#if defined WNT
-File gid_File_UreLink
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Brand_Root;
-    Name = "ure-link";
-    Styles = (PACKED);
-End
-#endif
-
 // Public Dynamic Libraries:
 
 File gid_File_Dl_Cppu
@@ -202,6 +193,10 @@ End
 // and on Windows into .../ure/bin/unorc. The latter two locations
 // are factored out as SCP2_URE_DL_DIR.
 
+// FIXME: remove this completely?
+// currently getting 'destination' at file not unique error on WNT
+// but needs handling of ENABLE_MACOSX_MACLIKE_APP_STRUCTURE then...
+#ifndef WNT
 Profile gid_Profile_Dl_Uno_Ini
     ModuleID = gid_Module_Root_Ure_Hidden;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
@@ -273,12 +268,12 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
     Value = "${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}";
 #endif
 End
+#endif
 
 File gid_File_ure_install
-    TXT_FILE_BODY;
     Dir = FILELIST_DIR;
-    Name = ure_install.filelist;
-    Styles = (FILELIST, PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Name = "ure_install.filelist";
+    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "1124A984-F905-47DC-ACEF-EDEC037F9B38";
 End
 
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index af4454d13c50..62fce647005f 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -12,13 +12,19 @@ $(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
 $(eval $(call gb_Package_set_outdir,ure_install,$(INSTDIR)))
 
 ifneq (WNT,$(OS))
+ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),)
 $(eval $(call gb_Package_add_file,ure_install,ure/bin/startup.sh,startup.sh))
 $(eval $(call gb_Package_add_symbolic_link,ure_install,ure/bin/uno,startup.sh))
 endif
+endif
 
 ifeq (MACOSX,$(OS))
-$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link/bin/urelibs,../lib))
-else ifneq (WNT,$(OS))
+ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),)
+$(eval $(call gb_Package_add_symbolic_link,ure_install,Contents/MacOS/urelibs,../ure-link/lib))
+endif
+else ifeq (WNT,$(OS))
+$(eval $(call gb_Package_add_file,ure_install,ure-link,ure-link))
+else
 $(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link,ure))
 endif
 
diff --git a/ure/source/ure-link b/ure/source/ure-link
new file mode 100644
index 000000000000..122de345e91f
--- /dev/null
+++ b/ure/source/ure-link
@@ -0,0 +1 @@
+URE
\ No newline at end of file