diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-25 10:51:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:57:28 +0100 |
| commit | eef94c1655605ce890f182e31f3cc64ee3748625 (patch) | |
| tree | c0a62c22c25228ec0c210f16d9c7d07300f79d1a /scp2 | |
| parent | ea25b851e1796efa90abbdadd3459122e6606db6 (diff) | |
Fold URE: Linux ure/bin/* -> program/
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/inc/macros.inc | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index d8c737098071..0f21cdffb758 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -74,7 +74,11 @@ #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 +#else #define GID_DIR_URE_BIN gid_Dir_Ure_Bin +#endif #define GID_DIR_URE_JAVA gid_Dir_Ure_Java #define GID_DIR_URE_LIB gid_Dir_Ure_Lib #define GID_DIR_URE_SHARE gid_Dir_Ure_Share diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 9da2e26118b1..4c250b910664 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -33,10 +33,12 @@ Directory gid_Dir_Common_Ure Styles = (UREDIRECTORY); End +#if defined WNT Directory gid_Dir_Ure_Bin ParentID = gid_Dir_Common_Ure; DosName = "bin"; End +#endif #if !defined WNT Directory gid_Dir_Ure_Lib |