diff --git a/ChangeLog b/ChangeLog index 0acfdabb3..6a2d745dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-02-16 Nicola Pero + + * configure.ac: Added GNUSTEP_*_ADMIN_APPS and GNUSTEP_*_ADMIN_TOOLS + variables. + * configure: Regenerated. + * Headers/Additions/GNUstepBase/config.h.in: Regenerated. + * Source/NSPathUtilities.m: Read the new config variables. + Updated NSAdminApplicationDirectory and NSAllApplicationsDirectory + for it. + 2007-02-15 Richard Frith-Macdonald * Source/NSTimeZone.m: diff --git a/Headers/Additions/GNUstepBase/config.h.in b/Headers/Additions/GNUstepBase/config.h.in index d068f521a..9faca5b7c 100644 --- a/Headers/Additions/GNUstepBase/config.h.in +++ b/Headers/Additions/GNUstepBase/config.h.in @@ -15,6 +15,12 @@ /* Built in default value for GNUstep config file */ #undef GNUSTEP_TARGET_CONFIG_FILE +/* Built in default value for GNUstep local apps */ +#undef GNUSTEP_TARGET_LOCAL_ADMIN_APPS + +/* Built in default value for GNUstep local tools */ +#undef GNUSTEP_TARGET_LOCAL_ADMIN_TOOLS + /* Built in default value for GNUstep local apps */ #undef GNUSTEP_TARGET_LOCAL_APPS @@ -45,6 +51,12 @@ /* Built in default value for GNUstep Makefiles */ #undef GNUSTEP_TARGET_MAKEFILES +/* Built in default value for GNUstep network apps */ +#undef GNUSTEP_TARGET_NETWORK_ADMIN_APPS + +/* Built in default value for GNUstep system tools */ +#undef GNUSTEP_TARGET_NETWORK_ADMIN_TOOLS + /* Built in default value for GNUstep network apps */ #undef GNUSTEP_TARGET_NETWORK_APPS @@ -72,6 +84,12 @@ /* Built in default value for GNUstep network tools */ #undef GNUSTEP_TARGET_NETWORK_TOOLS +/* Built in default value for GNUstep system apps */ +#undef GNUSTEP_TARGET_SYSTEM_ADMIN_APPS + +/* Built in default value for GNUstep system tools */ +#undef GNUSTEP_TARGET_SYSTEM_ADMIN_TOOLS + /* Built in default value for GNUstep system apps */ #undef GNUSTEP_TARGET_SYSTEM_APPS @@ -108,6 +126,12 @@ /* Built in default value for GNUstep user directory */ #undef GNUSTEP_TARGET_USER_DIR +/* Built in default value for GNUstep user_dir apps */ +#undef GNUSTEP_TARGET_USER_DIR_ADMIN_APPS + +/* Built in default value for GNUstep user_dir tools */ +#undef GNUSTEP_TARGET_USER_DIR_ADMIN_TOOLS + /* Built in default value for GNUstep user_dir apps */ #undef GNUSTEP_TARGET_USER_DIR_APPS diff --git a/Source/NSPathUtilities.m b/Source/NSPathUtilities.m index b178c5a22..a9d717c99 100644 --- a/Source/NSPathUtilities.m +++ b/Source/NSPathUtilities.m @@ -159,7 +159,9 @@ static NSString *tempDir = nil; /* user's temporary directory */ static NSString *gnustepMakefiles = nil; static NSString *gnustepSystemApps = nil; +static NSString *gnustepSystemAdminApps = nil; static NSString *gnustepSystemTools = nil; +static NSString *gnustepSystemAdminTools = nil; static NSString *gnustepSystemLibrary = nil; static NSString *gnustepSystemLibraries = nil; static NSString *gnustepSystemHeaders = nil; @@ -168,7 +170,9 @@ static NSString *gnustepSystemDocumentationInfo = nil; static NSString *gnustepSystemDocumentationMan = nil; static NSString *gnustepNetworkApps = nil; +static NSString *gnustepNetworkAdminApps = nil; static NSString *gnustepNetworkTools = nil; +static NSString *gnustepNetworkAdminTools = nil; static NSString *gnustepNetworkLibrary = nil; static NSString *gnustepNetworkLibraries = nil; static NSString *gnustepNetworkHeaders = nil; @@ -177,7 +181,9 @@ static NSString *gnustepNetworkDocumentationInfo = nil; static NSString *gnustepNetworkDocumentationMan = nil; static NSString *gnustepLocalApps = nil; +static NSString *gnustepLocalAdminApps = nil; static NSString *gnustepLocalTools = nil; +static NSString *gnustepLocalAdminTools = nil; static NSString *gnustepLocalLibrary = nil; static NSString *gnustepLocalLibraries = nil; static NSString *gnustepLocalHeaders = nil; @@ -186,7 +192,9 @@ static NSString *gnustepLocalDocumentationInfo = nil; static NSString *gnustepLocalDocumentationMan = nil; static NSString *gnustepUserApps = nil; +static NSString *gnustepUserAdminApps = nil; static NSString *gnustepUserTools = nil; +static NSString *gnustepUserAdminTools = nil; static NSString *gnustepUserLibrary = nil; static NSString *gnustepUserLibraries = nil; static NSString *gnustepUserHeaders = nil; @@ -199,7 +207,9 @@ static NSString *gnustepUserDocumentationMan = nil; * we read from config files. */ static NSString *gnustepUserDirApps = nil; +static NSString *gnustepUserDirAdminApps = nil; static NSString *gnustepUserDirTools = nil; +static NSString *gnustepUserDirAdminTools = nil; static NSString *gnustepUserDirLibrary = nil; static NSString *gnustepUserDirLibraries = nil; static NSString *gnustepUserDirHeaders = nil; @@ -323,7 +333,9 @@ static void ExtractValuesFromConfig(NSDictionary *config) ASSIGN_PATH(gnustepMakefiles, c, @"GNUSTEP_MAKEFILES"); ASSIGN_PATH(gnustepSystemApps, c, @"GNUSTEP_SYSTEM_APPS"); + ASSIGN_PATH(gnustepSystemAdminApps, c, @"GNUSTEP_SYSTEM_ADMIN_APPS"); ASSIGN_PATH(gnustepSystemTools, c, @"GNUSTEP_SYSTEM_TOOLS"); + ASSIGN_PATH(gnustepSystemAdminTools, c, @"GNUSTEP_SYSTEM_ADMIN_TOOLS"); ASSIGN_PATH(gnustepSystemLibrary, c, @"GNUSTEP_SYSTEM_LIBRARY"); ASSIGN_PATH(gnustepSystemLibraries, c, @"GNUSTEP_SYSTEM_LIBRARIES"); ASSIGN_PATH(gnustepSystemHeaders, c, @"GNUSTEP_SYSTEM_HEADERS"); @@ -332,7 +344,9 @@ static void ExtractValuesFromConfig(NSDictionary *config) ASSIGN_PATH(gnustepSystemDocumentationInfo, c, @"GNUSTEP_SYSTEM_DOCUMENTATION_INFO"); ASSIGN_PATH(gnustepNetworkApps, c, @"GNUSTEP_NETWORK_APPS"); + ASSIGN_PATH(gnustepNetworkAdminApps, c, @"GNUSTEP_NETWORK_ADMIN_APPS"); ASSIGN_PATH(gnustepNetworkTools, c, @"GNUSTEP_NETWORK_TOOLS"); + ASSIGN_PATH(gnustepNetworkAdminTools, c, @"GNUSTEP_NETWORK_ADMIN_TOOLS"); ASSIGN_PATH(gnustepNetworkLibrary, c, @"GNUSTEP_NETWORK_LIBRARY"); ASSIGN_PATH(gnustepNetworkLibraries, c, @"GNUSTEP_NETWORK_LIBRARIES"); ASSIGN_PATH(gnustepNetworkHeaders, c, @"GNUSTEP_NETWORK_HEADERS"); @@ -341,7 +355,9 @@ static void ExtractValuesFromConfig(NSDictionary *config) ASSIGN_PATH(gnustepNetworkDocumentationInfo, c, @"GNUSTEP_NETWORK_DOCUMENTATION_INFO"); ASSIGN_PATH(gnustepLocalApps, c, @"GNUSTEP_LOCAL_APPS"); + ASSIGN_PATH(gnustepLocalAdminApps, c, @"GNUSTEP_LOCAL_ADMIN_APPS"); ASSIGN_PATH(gnustepLocalTools, c, @"GNUSTEP_LOCAL_TOOLS"); + ASSIGN_PATH(gnustepLocalAdminTools, c, @"GNUSTEP_LOCAL_ADMIN_TOOLS"); ASSIGN_PATH(gnustepLocalLibrary, c, @"GNUSTEP_LOCAL_LIBRARY"); ASSIGN_PATH(gnustepLocalLibraries, c, @"GNUSTEP_LOCAL_LIBRARIES"); ASSIGN_PATH(gnustepLocalHeaders, c, @"GNUSTEP_LOCAL_HEADERS"); @@ -350,7 +366,9 @@ static void ExtractValuesFromConfig(NSDictionary *config) ASSIGN_PATH(gnustepLocalDocumentationInfo, c, @"GNUSTEP_LOCAL_DOCUMENTATION_INFO"); ASSIGN_IF_SET(gnustepUserDirApps, c, @"GNUSTEP_USER_DIR_APPS"); + ASSIGN_IF_SET(gnustepUserDirAdminApps, c, @"GNUSTEP_USER_DIR_ADMIN_APPS"); ASSIGN_IF_SET(gnustepUserDirTools, c, @"GNUSTEP_USER_DIR_TOOLS"); + ASSIGN_IF_SET(gnustepUserDirAdminTools, c, @"GNUSTEP_USER_DIR_ADMIN_TOOLS"); ASSIGN_IF_SET(gnustepUserDirLibrary, c, @"GNUSTEP_USER_DIR_LIBRARY"); ASSIGN_IF_SET(gnustepUserDirLibraries, c, @"GNUSTEP_USER_DIR_LIBRARIES"); ASSIGN_IF_SET(gnustepUserDirHeaders, c, @"GNUSTEP_USER_DIR_HEADERS"); @@ -449,9 +467,15 @@ static void ExtractValuesFromConfig(NSDictionary *config) ASSIGN(gnustepUserApps, [gnustepUserHome stringByAppendingPathComponent: gnustepUserDirApps]); + ASSIGN(gnustepUserAdminApps, + [gnustepUserHome stringByAppendingPathComponent: gnustepUserDirAdminApps]); + ASSIGN(gnustepUserTools, [gnustepUserHome stringByAppendingPathComponent: gnustepUserDirTools]); + ASSIGN(gnustepUserAdminTools, + [gnustepUserHome stringByAppendingPathComponent: gnustepUserDirAdminTools]); + ASSIGN(gnustepUserLibrary, [gnustepUserHome stringByAppendingPathComponent: gnustepUserDirLibrary]); @@ -505,7 +529,9 @@ static void ExtractValuesFromConfig(NSDictionary *config) ASSIGN_DEFAULT_PATH(gnustepLocalRoot, @GNUSTEP_TARGET_LOCAL_ROOT); ASSIGN_DEFAULT_PATH(gnustepSystemApps, @GNUSTEP_TARGET_SYSTEM_APPS); + ASSIGN_DEFAULT_PATH(gnustepSystemAdminApps, @GNUSTEP_TARGET_SYSTEM_ADMIN_APPS); ASSIGN_DEFAULT_PATH(gnustepSystemTools, @GNUSTEP_TARGET_SYSTEM_TOOLS); + ASSIGN_DEFAULT_PATH(gnustepSystemAdminTools, @GNUSTEP_TARGET_SYSTEM_ADMIN_TOOLS); ASSIGN_DEFAULT_PATH(gnustepSystemLibrary, @GNUSTEP_TARGET_SYSTEM_LIBRARY); ASSIGN_DEFAULT_PATH(gnustepSystemLibraries, @GNUSTEP_TARGET_SYSTEM_LIBRARIES); ASSIGN_DEFAULT_PATH(gnustepSystemHeaders, @GNUSTEP_TARGET_SYSTEM_HEADERS); @@ -514,7 +540,9 @@ static void ExtractValuesFromConfig(NSDictionary *config) ASSIGN_DEFAULT_PATH(gnustepSystemDocumentationInfo, @GNUSTEP_TARGET_SYSTEM_DOCUMENTATION_INFO); ASSIGN_DEFAULT_PATH(gnustepNetworkApps, @GNUSTEP_TARGET_NETWORK_APPS); + ASSIGN_DEFAULT_PATH(gnustepNetworkAdminApps, @GNUSTEP_TARGET_NETWORK_ADMIN_APPS); ASSIGN_DEFAULT_PATH(gnustepNetworkTools, @GNUSTEP_TARGET_NETWORK_TOOLS); + ASSIGN_DEFAULT_PATH(gnustepNetworkAdminTools, @GNUSTEP_TARGET_NETWORK_ADMIN_TOOLS); ASSIGN_DEFAULT_PATH(gnustepNetworkLibrary, @GNUSTEP_TARGET_NETWORK_LIBRARY); ASSIGN_DEFAULT_PATH(gnustepNetworkLibraries, @GNUSTEP_TARGET_NETWORK_LIBRARIES); ASSIGN_DEFAULT_PATH(gnustepNetworkHeaders, @GNUSTEP_TARGET_NETWORK_HEADERS); @@ -523,7 +551,9 @@ static void ExtractValuesFromConfig(NSDictionary *config) ASSIGN_DEFAULT_PATH(gnustepNetworkDocumentationInfo, @GNUSTEP_TARGET_NETWORK_DOCUMENTATION_INFO); ASSIGN_DEFAULT_PATH(gnustepLocalApps, @GNUSTEP_TARGET_LOCAL_APPS); + ASSIGN_DEFAULT_PATH(gnustepLocalAdminApps, @GNUSTEP_TARGET_LOCAL_ADMIN_APPS); ASSIGN_DEFAULT_PATH(gnustepLocalTools, @GNUSTEP_TARGET_LOCAL_TOOLS); + ASSIGN_DEFAULT_PATH(gnustepLocalAdminTools, @GNUSTEP_TARGET_LOCAL_ADMIN_TOOLS); ASSIGN_DEFAULT_PATH(gnustepLocalLibrary, @GNUSTEP_TARGET_LOCAL_LIBRARY); ASSIGN_DEFAULT_PATH(gnustepLocalLibraries, @GNUSTEP_TARGET_LOCAL_LIBRARIES); ASSIGN_DEFAULT_PATH(gnustepLocalHeaders, @GNUSTEP_TARGET_LOCAL_HEADERS); @@ -770,7 +800,9 @@ static void ShutdownPathUtilities(void) DESTROY(gnustepMakefiles); DESTROY(gnustepSystemApps); + DESTROY(gnustepSystemAdminApps); DESTROY(gnustepSystemTools); + DESTROY(gnustepSystemAdminTools); DESTROY(gnustepSystemLibrary); DESTROY(gnustepSystemLibraries); DESTROY(gnustepSystemHeaders); @@ -779,7 +811,9 @@ static void ShutdownPathUtilities(void) DESTROY(gnustepSystemDocumentationInfo); DESTROY(gnustepNetworkApps); + DESTROY(gnustepNetworkAdminApps); DESTROY(gnustepNetworkTools); + DESTROY(gnustepNetworkAdminTools); DESTROY(gnustepNetworkLibrary); DESTROY(gnustepNetworkLibraries); DESTROY(gnustepNetworkHeaders); @@ -788,7 +822,9 @@ static void ShutdownPathUtilities(void) DESTROY(gnustepNetworkDocumentationInfo); DESTROY(gnustepLocalApps); + DESTROY(gnustepLocalAdminApps); DESTROY(gnustepLocalTools); + DESTROY(gnustepLocalAdminTools); DESTROY(gnustepLocalLibrary); DESTROY(gnustepLocalLibraries); DESTROY(gnustepLocalHeaders); @@ -797,7 +833,9 @@ static void ShutdownPathUtilities(void) DESTROY(gnustepLocalDocumentationInfo); DESTROY(gnustepUserApps); + DESTROY(gnustepUserAdminApps); DESTROY(gnustepUserTools); + DESTROY(gnustepUserAdminTools); DESTROY(gnustepUserLibrary); DESTROY(gnustepUserLibraries); DESTROY(gnustepUserHeaders); @@ -1594,15 +1632,15 @@ if (domainMask & mask) \ { case NSAllApplicationsDirectory: { - /* We don't really have any separation of applications by type, - * we put everything in Applications. So for now no point - * in returning anything different and spending time scanning - * the disk for non-existing dirs. - */ ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps); ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps); ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps); ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps); + + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserAdminApps); + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalAdminApps); + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkAdminApps); + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemAdminApps); } break; @@ -1669,21 +1707,10 @@ if (domainMask & mask) \ case NSAdminApplicationDirectory: { - /* NSUserDomainMask - users have no Administrator directory */ - /* ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserApps); */ - ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalApps); - ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkApps); - ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemApps); - - /* I imagine if ever wanted a separate Administrator directory, the - * only way for this to have some meaning across filesystems - * would be as a subdirectory of Applications, as follows. - */ - /* - ADD_PATH(NSLocalDomainMask, gnustepLocalApps, @"Administrator"); - ADD_PATH(NSNetworkDomainMask, gnustepNetworkApps, @"Administrator"); - ADD_PATH(NSSystemDomainMask, gnustepSystemApps, @"Administrator"); - */ + ADD_PLATFORM_PATH(NSUserDomainMask, gnustepUserAdminApps); + ADD_PLATFORM_PATH(NSLocalDomainMask, gnustepLocalAdminApps); + ADD_PLATFORM_PATH(NSNetworkDomainMask, gnustepNetworkAdminApps); + ADD_PLATFORM_PATH(NSSystemDomainMask, gnustepSystemAdminApps); } break; diff --git a/configure b/configure index c679ee48a..53472cdc5 100755 --- a/configure +++ b/configure @@ -1698,7 +1698,9 @@ fi if test x"$GNUSTEP_MAKEFILES" = x""; then GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Library/Makefiles; fi if test x"$GNUSTEP_SYSTEM_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps; fi +if test x"$GNUSTEP_SYSTEM_ADMIN_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps/Admin; fi if test x"$GNUSTEP_SYSTEM_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools; fi +if test x"$GNUSTEP_SYSTEM_ADMIN_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools/Admin; fi if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then GNUSTEP_SYSTEM_LIBRARY=$GNUSTEP_SYSTEM_ROOT/Library; fi if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then GNUSTEP_SYSTEM_LIBRARIES=$GNUSTEP_SYSTEM_ROOT/Libraries; fi if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then GNUSTEP_SYSTEM_HEADERS=$GNUSTEP_SYSTEM_ROOT/Headers; fi @@ -1707,7 +1709,9 @@ if test x"$GNUSTEP_SYSTEM_DOCUMENTATION_MAN" = x""; then GNUSTEP_SYSTEM_DOCUMENT if test x"$GNUSTEP_SYSTEM_DOCUMENTATION_INFO" = x""; then GNUSTEP_SYSTEM_DOCUMENTATION_INFO=$GNUSTEP_SYSTEM_ROOT/Documentation/info; fi if test x"$GNUSTEP_NETWORK_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Apps; fi +if test x"$GNUSTEP_NETWORK_ADMIN_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Apps/Admin; fi if test x"$GNUSTEP_NETWORK_TOOLS" = x""; then GNUSTEP_NETWORK_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools; fi +if test x"$GNUSTEP_NETWORK_ADMIN_TOOLS" = x""; then GNUSTEP_NETWORK_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools/Admin; fi if test x"$GNUSTEP_NETWORK_LIBRARY" = x""; then GNUSTEP_NETWORK_LIBRARY=$GNUSTEP_NETWORK_ROOT/Library; fi if test x"$GNUSTEP_NETWORK_LIBRARIES" = x""; then GNUSTEP_NETWORK_LIBRARIES=$GNUSTEP_NETWORK_ROOT/Libraries; fi if test x"$GNUSTEP_NETWORK_HEADERS" = x""; then GNUSTEP_NETWORK_HEADERS=$GNUSTEP_NETWORK_ROOT/Headers; fi @@ -1716,7 +1720,9 @@ if test x"$GNUSTEP_NETWORK_DOCUMENTATION_MAN" = x""; then GNUSTEP_NETWORK_DOCUME if test x"$GNUSTEP_NETWORK_DOCUMENTATION_INFO" = x""; then GNUSTEP_NETWORK_DOCUMENTATION_INFO=$GNUSTEP_NETWORK_ROOT/Documentation/info; fi if test x"$GNUSTEP_LOCAL_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Apps; fi +if test x"$GNUSTEP_LOCAL_ADMIN_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Apps/Admin; fi if test x"$GNUSTEP_LOCAL_TOOLS" = x""; then GNUSTEP_LOCAL_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools; fi +if test x"$GNUSTEP_LOCAL_ADMIN_TOOLS" = x""; then GNUSTEP_LOCAL_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools/Admin; fi if test x"$GNUSTEP_LOCAL_LIBRARY" = x""; then GNUSTEP_LOCAL_LIBRARY=$GNUSTEP_LOCAL_ROOT/Library; fi if test x"$GNUSTEP_LOCAL_LIBRARIES" = x""; then GNUSTEP_LOCAL_LIBRARIES=$GNUSTEP_LOCAL_ROOT/Libraries; fi if test x"$GNUSTEP_LOCAL_HEADERS" = x""; then GNUSTEP_LOCAL_HEADERS=$GNUSTEP_LOCAL_ROOT/Headers; fi @@ -1725,7 +1731,9 @@ if test x"$GNUSTEP_LOCAL_DOCUMENTATION_MAN" = x""; then GNUSTEP_LOCAL_DOCUMENTAT if test x"$GNUSTEP_LOCAL_DOCUMENTATION_INFO" = x""; then GNUSTEP_LOCAL_DOCUMENTATION_INFO=$GNUSTEP_LOCAL_ROOT/Documentation/info; fi if test x"$GNUSTEP_USER_DIR_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Apps; fi +if test x"$GNUSTEP_USER_DIR_ADMIN_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Apps/Admin; fi if test x"$GNUSTEP_USER_DIR_TOOLS" = x""; then GNUSTEP_USER_DIR_TOOLS=$GNUSTEP_USER_DIR/Tools; fi +if test x"$GNUSTEP_USER_DIR_ADMIN_TOOLS" = x""; then GNUSTEP_USER_DIR_TOOLS=$GNUSTEP_USER_DIR/Tools/Admin; fi if test x"$GNUSTEP_USER_DIR_LIBRARY" = x""; then GNUSTEP_USER_DIR_LIBRARY=$GNUSTEP_USER_DIR/Library; fi if test x"$GNUSTEP_USER_DIR_LIBRARIES" = x""; then GNUSTEP_USER_DIR_LIBRARIES=$GNUSTEP_USER_DIR/Libraries; fi if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then GNUSTEP_USER_DIR_HEADERS=$GNUSTEP_USER_DIR/Headers; fi @@ -1796,6 +1804,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF +GNUSTEP_SYSTEM_ADMIN_APPS=`echo $GNUSTEP_SYSTEM_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'` + +cat >>confdefs.h <<_ACEOF +#define GNUSTEP_TARGET_SYSTEM_ADMIN_APPS "$GNUSTEP_SYSTEM_ADMIN_APPS" +_ACEOF + + GNUSTEP_SYSTEM_TOOLS=`echo $GNUSTEP_SYSTEM_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` cat >>confdefs.h <<_ACEOF @@ -1803,6 +1818,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF +GNUSTEP_SYSTEM_ADMIN_TOOLS=`echo $GNUSTEP_SYSTEM_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` + +cat >>confdefs.h <<_ACEOF +#define GNUSTEP_TARGET_SYSTEM_ADMIN_TOOLS "$GNUSTEP_SYSTEM_ADMIN_TOOLS" +_ACEOF + + GNUSTEP_SYSTEM_LIBRARY=`echo $GNUSTEP_SYSTEM_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'` cat >>confdefs.h <<_ACEOF @@ -1855,6 +1877,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF +GNUSTEP_NETWORK_ADMIN_APPS=`echo $GNUSTEP_NETWORK_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'` + +cat >>confdefs.h <<_ACEOF +#define GNUSTEP_TARGET_NETWORK_ADMIN_APPS "$GNUSTEP_NETWORK_ADMIN_APPS" +_ACEOF + + GNUSTEP_NETWORK_TOOLS=`echo $GNUSTEP_NETWORK_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` cat >>confdefs.h <<_ACEOF @@ -1862,6 +1891,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF +GNUSTEP_NETWORK_ADMIN_TOOLS=`echo $GNUSTEP_NETWORK_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` + +cat >>confdefs.h <<_ACEOF +#define GNUSTEP_TARGET_NETWORK_ADMIN_TOOLS "$GNUSTEP_NETWORK_ADMIN_TOOLS" +_ACEOF + + GNUSTEP_NETWORK_LIBRARY=`echo $GNUSTEP_NETWORK_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'` cat >>confdefs.h <<_ACEOF @@ -1914,6 +1950,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF +GNUSTEP_LOCAL_ADMIN_APPS=`echo $GNUSTEP_LOCAL_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'` + +cat >>confdefs.h <<_ACEOF +#define GNUSTEP_TARGET_LOCAL_ADMIN_APPS "$GNUSTEP_LOCAL_ADMIN_APPS" +_ACEOF + + GNUSTEP_LOCAL_TOOLS=`echo $GNUSTEP_LOCAL_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` cat >>confdefs.h <<_ACEOF @@ -1921,6 +1964,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF +GNUSTEP_LOCAL_ADMIN_TOOLS=`echo $GNUSTEP_LOCAL_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` + +cat >>confdefs.h <<_ACEOF +#define GNUSTEP_TARGET_LOCAL_ADMIN_TOOLS "$GNUSTEP_LOCAL_ADMIN_TOOLS" +_ACEOF + + GNUSTEP_LOCAL_LIBRARY=`echo $GNUSTEP_LOCAL_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'` cat >>confdefs.h <<_ACEOF @@ -1973,6 +2023,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF +GNUSTEP_USER_DIR_ADMIN_APPS=`echo $GNUSTEP_USER_DIR_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'` + +cat >>confdefs.h <<_ACEOF +#define GNUSTEP_TARGET_USER_DIR_ADMIN_APPS "$GNUSTEP_USER_DIR_ADMIN_APPS" +_ACEOF + + GNUSTEP_USER_DIR_TOOLS=`echo $GNUSTEP_USER_DIR_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` cat >>confdefs.h <<_ACEOF @@ -1980,6 +2037,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF +GNUSTEP_USER_DIR_ADMIN_TOOLS=`echo $GNUSTEP_USER_DIR_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` + +cat >>confdefs.h <<_ACEOF +#define GNUSTEP_TARGET_USER_DIR_ADMIN_TOOLS "$GNUSTEP_USER_DIR_ADMIN_TOOLS" +_ACEOF + + GNUSTEP_USER_DIR_LIBRARY=`echo $GNUSTEP_USER_DIR_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'` cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 37585a99b..4232fb25f 100644 --- a/configure.ac +++ b/configure.ac @@ -263,7 +263,9 @@ fi if test x"$GNUSTEP_MAKEFILES" = x""; then GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Library/Makefiles; fi if test x"$GNUSTEP_SYSTEM_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps; fi +if test x"$GNUSTEP_SYSTEM_ADMIN_APPS" = x""; then GNUSTEP_SYSTEM_APPS=$GNUSTEP_SYSTEM_ROOT/Apps/Admin; fi if test x"$GNUSTEP_SYSTEM_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools; fi +if test x"$GNUSTEP_SYSTEM_ADMIN_TOOLS" = x""; then GNUSTEP_SYSTEM_TOOLS=$GNUSTEP_SYSTEM_ROOT/Tools/Admin; fi if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then GNUSTEP_SYSTEM_LIBRARY=$GNUSTEP_SYSTEM_ROOT/Library; fi if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then GNUSTEP_SYSTEM_LIBRARIES=$GNUSTEP_SYSTEM_ROOT/Libraries; fi if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then GNUSTEP_SYSTEM_HEADERS=$GNUSTEP_SYSTEM_ROOT/Headers; fi @@ -272,7 +274,9 @@ if test x"$GNUSTEP_SYSTEM_DOCUMENTATION_MAN" = x""; then GNUSTEP_SYSTEM_DOCUMENT if test x"$GNUSTEP_SYSTEM_DOCUMENTATION_INFO" = x""; then GNUSTEP_SYSTEM_DOCUMENTATION_INFO=$GNUSTEP_SYSTEM_ROOT/Documentation/info; fi if test x"$GNUSTEP_NETWORK_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Apps; fi +if test x"$GNUSTEP_NETWORK_ADMIN_APPS" = x""; then GNUSTEP_NETWORK_APPS=$GNUSTEP_NETWORK_ROOT/Apps/Admin; fi if test x"$GNUSTEP_NETWORK_TOOLS" = x""; then GNUSTEP_NETWORK_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools; fi +if test x"$GNUSTEP_NETWORK_ADMIN_TOOLS" = x""; then GNUSTEP_NETWORK_TOOLS=$GNUSTEP_NETWORK_ROOT/Tools/Admin; fi if test x"$GNUSTEP_NETWORK_LIBRARY" = x""; then GNUSTEP_NETWORK_LIBRARY=$GNUSTEP_NETWORK_ROOT/Library; fi if test x"$GNUSTEP_NETWORK_LIBRARIES" = x""; then GNUSTEP_NETWORK_LIBRARIES=$GNUSTEP_NETWORK_ROOT/Libraries; fi if test x"$GNUSTEP_NETWORK_HEADERS" = x""; then GNUSTEP_NETWORK_HEADERS=$GNUSTEP_NETWORK_ROOT/Headers; fi @@ -281,7 +285,9 @@ if test x"$GNUSTEP_NETWORK_DOCUMENTATION_MAN" = x""; then GNUSTEP_NETWORK_DOCUME if test x"$GNUSTEP_NETWORK_DOCUMENTATION_INFO" = x""; then GNUSTEP_NETWORK_DOCUMENTATION_INFO=$GNUSTEP_NETWORK_ROOT/Documentation/info; fi if test x"$GNUSTEP_LOCAL_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Apps; fi +if test x"$GNUSTEP_LOCAL_ADMIN_APPS" = x""; then GNUSTEP_LOCAL_APPS=$GNUSTEP_LOCAL_ROOT/Apps/Admin; fi if test x"$GNUSTEP_LOCAL_TOOLS" = x""; then GNUSTEP_LOCAL_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools; fi +if test x"$GNUSTEP_LOCAL_ADMIN_TOOLS" = x""; then GNUSTEP_LOCAL_TOOLS=$GNUSTEP_LOCAL_ROOT/Tools/Admin; fi if test x"$GNUSTEP_LOCAL_LIBRARY" = x""; then GNUSTEP_LOCAL_LIBRARY=$GNUSTEP_LOCAL_ROOT/Library; fi if test x"$GNUSTEP_LOCAL_LIBRARIES" = x""; then GNUSTEP_LOCAL_LIBRARIES=$GNUSTEP_LOCAL_ROOT/Libraries; fi if test x"$GNUSTEP_LOCAL_HEADERS" = x""; then GNUSTEP_LOCAL_HEADERS=$GNUSTEP_LOCAL_ROOT/Headers; fi @@ -290,7 +296,9 @@ if test x"$GNUSTEP_LOCAL_DOCUMENTATION_MAN" = x""; then GNUSTEP_LOCAL_DOCUMENTAT if test x"$GNUSTEP_LOCAL_DOCUMENTATION_INFO" = x""; then GNUSTEP_LOCAL_DOCUMENTATION_INFO=$GNUSTEP_LOCAL_ROOT/Documentation/info; fi if test x"$GNUSTEP_USER_DIR_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Apps; fi +if test x"$GNUSTEP_USER_DIR_ADMIN_APPS" = x""; then GNUSTEP_USER_DIR_APPS=$GNUSTEP_USER_DIR/Apps/Admin; fi if test x"$GNUSTEP_USER_DIR_TOOLS" = x""; then GNUSTEP_USER_DIR_TOOLS=$GNUSTEP_USER_DIR/Tools; fi +if test x"$GNUSTEP_USER_DIR_ADMIN_TOOLS" = x""; then GNUSTEP_USER_DIR_TOOLS=$GNUSTEP_USER_DIR/Tools/Admin; fi if test x"$GNUSTEP_USER_DIR_LIBRARY" = x""; then GNUSTEP_USER_DIR_LIBRARY=$GNUSTEP_USER_DIR/Library; fi if test x"$GNUSTEP_USER_DIR_LIBRARIES" = x""; then GNUSTEP_USER_DIR_LIBRARIES=$GNUSTEP_USER_DIR/Libraries; fi if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then GNUSTEP_USER_DIR_HEADERS=$GNUSTEP_USER_DIR/Headers; fi @@ -343,11 +351,21 @@ AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_SYSTEM_APPS, "$GNUSTEP_SYSTEM_APPS", [Built in default value for GNUstep system apps]) +GNUSTEP_SYSTEM_ADMIN_APPS=`echo $GNUSTEP_SYSTEM_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'` +AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_SYSTEM_ADMIN_APPS, + "$GNUSTEP_SYSTEM_ADMIN_APPS", + [Built in default value for GNUstep system apps]) + GNUSTEP_SYSTEM_TOOLS=`echo $GNUSTEP_SYSTEM_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_SYSTEM_TOOLS, "$GNUSTEP_SYSTEM_TOOLS", [Built in default value for GNUstep system tools]) +GNUSTEP_SYSTEM_ADMIN_TOOLS=`echo $GNUSTEP_SYSTEM_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` +AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_SYSTEM_ADMIN_TOOLS, + "$GNUSTEP_SYSTEM_ADMIN_TOOLS", + [Built in default value for GNUstep system tools]) + GNUSTEP_SYSTEM_LIBRARY=`echo $GNUSTEP_SYSTEM_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_SYSTEM_LIBRARY, "$GNUSTEP_SYSTEM_LIBRARY", @@ -386,11 +404,21 @@ AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_NETWORK_APPS, "$GNUSTEP_NETWORK_APPS", [Built in default value for GNUstep network apps]) +GNUSTEP_NETWORK_ADMIN_APPS=`echo $GNUSTEP_NETWORK_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'` +AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_NETWORK_ADMIN_APPS, + "$GNUSTEP_NETWORK_ADMIN_APPS", + [Built in default value for GNUstep network apps]) + GNUSTEP_NETWORK_TOOLS=`echo $GNUSTEP_NETWORK_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_NETWORK_TOOLS, "$GNUSTEP_NETWORK_TOOLS", [Built in default value for GNUstep network tools]) +GNUSTEP_NETWORK_ADMIN_TOOLS=`echo $GNUSTEP_NETWORK_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` +AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_NETWORK_ADMIN_TOOLS, + "$GNUSTEP_NETWORK_ADMIN_TOOLS", + [Built in default value for GNUstep system tools]) + GNUSTEP_NETWORK_LIBRARY=`echo $GNUSTEP_NETWORK_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_NETWORK_LIBRARY, "$GNUSTEP_NETWORK_LIBRARY", @@ -429,11 +457,21 @@ AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_LOCAL_APPS, "$GNUSTEP_LOCAL_APPS", [Built in default value for GNUstep local apps]) +GNUSTEP_LOCAL_ADMIN_APPS=`echo $GNUSTEP_LOCAL_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'` +AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_LOCAL_ADMIN_APPS, + "$GNUSTEP_LOCAL_ADMIN_APPS", + [Built in default value for GNUstep local apps]) + GNUSTEP_LOCAL_TOOLS=`echo $GNUSTEP_LOCAL_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_LOCAL_TOOLS, "$GNUSTEP_LOCAL_TOOLS", [Built in default value for GNUstep local tools]) +GNUSTEP_LOCAL_ADMIN_TOOLS=`echo $GNUSTEP_LOCAL_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` +AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_LOCAL_ADMIN_TOOLS, + "$GNUSTEP_LOCAL_ADMIN_TOOLS", + [Built in default value for GNUstep local tools]) + GNUSTEP_LOCAL_LIBRARY=`echo $GNUSTEP_LOCAL_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_LOCAL_LIBRARY, "$GNUSTEP_LOCAL_LIBRARY", @@ -472,11 +510,21 @@ AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR_APPS, "$GNUSTEP_USER_DIR_APPS", [Built in default value for GNUstep user_dir apps]) +GNUSTEP_USER_DIR_ADMIN_APPS=`echo $GNUSTEP_USER_DIR_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'` +AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR_ADMIN_APPS, + "$GNUSTEP_USER_DIR_ADMIN_APPS", + [Built in default value for GNUstep user_dir apps]) + GNUSTEP_USER_DIR_TOOLS=`echo $GNUSTEP_USER_DIR_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR_TOOLS, "$GNUSTEP_USER_DIR_TOOLS", [Built in default value for GNUstep user_dir tools]) +GNUSTEP_USER_DIR_ADMIN_TOOLS=`echo $GNUSTEP_USER_DIR_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'` +AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR_ADMIN_TOOLS, + "$GNUSTEP_USER_DIR_ADMIN_TOOLS", + [Built in default value for GNUstep user_dir tools]) + GNUSTEP_USER_DIR_LIBRARY=`echo $GNUSTEP_USER_DIR_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'` AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_USER_DIR_LIBRARY, "$GNUSTEP_USER_DIR_LIBRARY",