From 8fdb23973521125892d4a99dc4e33463680a0047 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 28 Nov 2014 15:24:10 +0100 Subject: Fold URE: Linux ure/share/java/* -> program/classes/ Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb --- scp2/inc/macros.inc | 3 ++- scp2/source/ooo/ure.scp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'scp2') diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 514c3152254c..50fd2de23b63 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -76,10 +76,11 @@ #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 #else #define GID_DIR_URE_BIN gid_Dir_Ure_Bin -#endif #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 diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 819ac0f873c3..238728b86307 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -47,7 +47,7 @@ Directory gid_Dir_Ure_Share End #endif -#if defined ENABLE_JAVA +#if defined WNT && defined ENABLE_JAVA Directory gid_Dir_Ure_Java ParentID = SCP2_URE_SHARE_DIR; DosName = "java"; -- cgit