Fold URE: Linux ure/share/misc/* -> program/

...and remove now unused ure-link symlink

Change-Id: Ic958432c1dad4fae213982d0af072187f151620b

2 files changed, 11 insertions, 28 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 50fd2de23b63..cccf0d495be5 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -65,15 +65,12 @@
 #ifdef MACOSX
     #define GID_BRAND_DIR_ETC gid_Brand_Dir_Share
     #define GID_DIR_PY gid_Brand_Dir_Share
-    #define GID_DIR_URE gid_Dir_Bundle_Contents
     #define GID_DIR_URE_BIN gid_Brand_Dir_Program
     #define GID_DIR_URE_JAVA gid_Dir_Classes
     #define GID_DIR_URE_LIB gid_Dir_Frameworks
-    #define GID_DIR_URE_SHARE gid_Brand_Dir_Share_Ure
 #else
     #define GID_BRAND_DIR_ETC gid_Brand_Dir_Program
     #define GID_DIR_PY gid_Brand_Dir_Program
-    #define GID_DIR_URE gid_Dir_Common_Ure
 #if defined UNX
     #define GID_DIR_URE_BIN gid_Brand_Dir_Program
     #define GID_DIR_URE_JAVA gid_Dir_Classes
@@ -82,7 +79,6 @@
     #define GID_DIR_URE_JAVA gid_Dir_Ure_Java
 #endif
     #define GID_DIR_URE_LIB gid_Brand_Dir_Program
-    #define GID_DIR_URE_SHARE gid_Dir_Ure_Share
 #endif
 
 #define RESFILENAME(name,lang)                STRING(CONCAT3(name,lang,.res))
@@ -477,7 +473,6 @@ End
 #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
 #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
 #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
-#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
 #else
 #define SCP2_URE_DL_DIR GID_DIR_URE_LIB
 #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
@@ -493,7 +488,6 @@ End
     "libuno_" n STRING(COMID) STRING(UNXSUFFIX) "." v
 #define SCP2_URE_DL_UNO_COMID_NORMAL(n)	\
     "libuno_" n STRING(COMID) STRING(UNXSUFFIX)
-#define SCP2_URE_SHARE_DIR GID_DIR_URE_SHARE
 #endif
 #if defined MACOSX
 #define SCP2_URE_JDL_NORMAL(n) "lib" n ".jnilib"
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 238728b86307..9bb8ebea2b2c 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -22,16 +22,13 @@
 
 #if !defined MACOSX
 
+#if defined WNT
 Directory gid_Dir_Common_Ure
-  #ifdef WNT
     ParentID = gid_Dir_Brand_Root;
     HostName = "URE";
-  #else
-    ParentID = PREDEFINED_PROGDIR;
-    HostName = "ure";
-  #endif
     Styles = (UREDIRECTORY);
 End
+#endif
 
 #if defined WNT
 Directory gid_Dir_Ure_Bin
@@ -40,36 +37,25 @@ Directory gid_Dir_Ure_Bin
 End
 #endif
 
-#if !defined WNT
-Directory gid_Dir_Ure_Share
-    ParentID = gid_Dir_Common_Ure;
-    DosName = "share";
-End
-#endif
-
 #if defined WNT && defined ENABLE_JAVA
 Directory gid_Dir_Ure_Java
-    ParentID = SCP2_URE_SHARE_DIR;
+    ParentID = gid_Dir_Common_Ure;
     DosName = "java";
 End
 #endif
 
 #endif // !MACOSX
 
-#if !defined WNT
-Directory gid_Dir_Ure_Share_Misc
 #if defined MACOSX
+Directory gid_Dir_Ure_Share_Misc
     ParentID = gid_Brand_Dir_Share_Ure_Share;
-#else
-    ParentID = gid_Dir_Ure_Share;
-#endif
     DosName = "misc";
 End
 #endif
 
 #ifdef WNT
 Directory gid_Dir_Ure_Misc
-    ParentID = SCP2_URE_SHARE_DIR;
+    ParentID = gid_Dir_Common_Ure;
     DosName = "misc";
 End
 #endif
@@ -309,8 +295,10 @@ File gid_File_Misc_TypesRdb
     TXT_FILE_BODY;
 #ifdef WNT
     Dir = gid_Dir_Ure_Misc;
-#else
+#elif defined MACOSX
     Dir = gid_Dir_Ure_Share_Misc;
+#else
+    Dir = gid_Brand_Dir_Program;
 #endif
     Name = "types.rdb";
     Styles = (PACKED);
@@ -320,8 +308,10 @@ File gid_File_Misc_ServicesRdb
     TXT_FILE_BODY;
 #ifdef WNT
     Dir = gid_Dir_Ure_Misc;
-#else
+#elif defined MACOSX
     Dir = gid_Dir_Ure_Share_Misc;
+#else
+    Dir = gid_Brand_Dir_Program;
 #endif
     Name = "services.rdb";
     Styles = (PACKED);
@@ -340,7 +330,6 @@ Module gid_Module_Root_Ure_Hidden
 	Styles = (HIDDEN_ROOT);
     Dirs = (gid_Dir_Ure_Bin,
             gid_Dir_Ure_Misc,
-            gid_Dir_Ure_Share,
             gid_Dir_Ure_Java,
             gid_Dir_Ure_Share_Misc);
     Files = (auto_ure_ALL,