diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-01 15:10:19 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-01 15:10:32 +0100 |
| commit | 982f199a98a7d82e0109077882a645f1a442049e (patch) | |
| tree | 733bef575b66d224fc4c03cfecf69f86b1fbed27 /scp2/source/ooo/ure.scp | |
| parent | 8fc14413d9dadede63743ec76603d95eb587f580 (diff) | |
Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink
Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
Diffstat (limited to 'scp2/source/ooo/ure.scp')
| -rw-r--r-- | scp2/source/ooo/ure.scp | 33 |
1 files changed, 11 insertions, 22 deletions
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, |