Added GNUSTEP_*_USERS_DIR

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24779 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-03-06 13:24:25 +00:00
parent 6103b93ee8
commit f2a5f5795f
13 changed files with 222 additions and 87 deletions

View file

@ -1,3 +1,23 @@
2007-03-06 Nicola Pero <nicola.pero@meta-innovation.com>
* FilesystemLayouts/gnustep (GNUSTEP_SYSTEM_USERS_DIR,
GNUSTEP_NETWORK_USERS_DIR, GNUSTEP_LOCAL_USER_DIRS): New
variables.
* FilesystemLayouts/gnustep-with-network: Same changes.
* FilesystemLayouts/fhs: Same changes.
* FilesystemLayouts/fhs-system: Same changes.
* FilesystemLayouts/next: Same changes.
* GNUstep.conf.in: Same changes.
* filesystem.make.in: Same changes.
* filesystem.sh.in: Same changes.
* filesystem.csh.in: Same changes.
* GNUstep-reset.sh: Same changes.
* configure.ac: Same changes.
* configure: Regenerated.
* FilesystemLayouts/gnustep: Moved network domain before local
domain.
2007-03-06 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/framework.make: When version support is enabled, build

View file

@ -20,6 +20,13 @@
# by using ./configure --prefix=xxx when configuring.
GNUSTEP_DEFAULT_PREFIX=/usr/local
# These are only used by gnustep-base to implement the NSUserDirectory
# API. We never install anything in them. They will be used as they
# are without $prefix.
GNUSTEP_SYSTEM_USERS_DIR=/home
GNUSTEP_NETWORK_USERS_DIR=/home
GNUSTEP_LOCAL_USERS_DIR=/home
# NB: $prefix will be added to all the MAKEFILES/SYSTEM/NETWORK/LOCAL
# paths.
GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles

View file

@ -29,6 +29,13 @@
# by using ./configure --prefix=xxx when configuring.
GNUSTEP_DEFAULT_PREFIX=/usr
# These are only used by gnustep-base to implement the NSUserDirectory
# API. We never install anything in them. They will be used as they
# are without $prefix.
GNUSTEP_SYSTEM_USERS_DIR=/home
GNUSTEP_NETWORK_USERS_DIR=/home
GNUSTEP_LOCAL_USERS_DIR=/home
# NB: $prefix will be added to all the MAKEFILES/SYSTEM/NETWORK/LOCAL
# paths.
GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles

View file

@ -29,6 +29,13 @@
# by using ./configure --prefix=xxx when configuring.
GNUSTEP_DEFAULT_PREFIX=/usr/GNUstep
# These are only used by gnustep-base to implement the NSUserDirectory
# API. We never install anything in them. They will be used as they
# are without $prefix.
GNUSTEP_SYSTEM_USERS_DIR=/home
GNUSTEP_NETWORK_USERS_DIR=/home
GNUSTEP_LOCAL_USERS_DIR=/home
# NB: $prefix will be added to all the MAKEFILES/SYSTEM/NETWORK/LOCAL
# paths.
GNUSTEP_MAKEFILES=/System/Library/Makefiles
@ -45,18 +52,6 @@ GNUSTEP_SYSTEM_DOC=/System/Library/Documentation
GNUSTEP_SYSTEM_DOC_MAN=/System/Library/Documentation/man
GNUSTEP_SYSTEM_DOC_INFO=/System/Library/Documentation/info
GNUSTEP_LOCAL_APPS=/Local/Applications
GNUSTEP_LOCAL_ADMIN_APPS=/Local/Applications/Admin
GNUSTEP_LOCAL_WEB_APPS=/Local/Library/WebApplications
GNUSTEP_LOCAL_TOOLS=/Local/Tools
GNUSTEP_LOCAL_ADMIN_TOOLS=/Local/Tools/Admin
GNUSTEP_LOCAL_LIBRARY=/Local/Library
GNUSTEP_LOCAL_HEADERS=/Local/Library/Headers
GNUSTEP_LOCAL_LIBRARIES=/Local/Library/Libraries
GNUSTEP_LOCAL_DOC=/Local/Library/Documentation
GNUSTEP_LOCAL_DOC_MAN=/Local/Library/Documentation/man
GNUSTEP_LOCAL_DOC_INFO=/Local/Library/Documentation/info
GNUSTEP_NETWORK_APPS=/Local/Applications
GNUSTEP_NETWORK_ADMIN_APPS=/Local/Applications/Admin
GNUSTEP_NETWORK_WEB_APPS=/Local/Library/WebApplications
@ -69,6 +64,18 @@ GNUSTEP_NETWORK_DOC=/Local/Library/Documentation
GNUSTEP_NETWORK_DOC_MAN=/Local/Library/Documentation/man
GNUSTEP_NETWORK_DOC_INFO=/Local/Library/Documentation/info
GNUSTEP_LOCAL_APPS=/Local/Applications
GNUSTEP_LOCAL_ADMIN_APPS=/Local/Applications/Admin
GNUSTEP_LOCAL_WEB_APPS=/Local/Library/WebApplications
GNUSTEP_LOCAL_TOOLS=/Local/Tools
GNUSTEP_LOCAL_ADMIN_TOOLS=/Local/Tools/Admin
GNUSTEP_LOCAL_LIBRARY=/Local/Library
GNUSTEP_LOCAL_HEADERS=/Local/Library/Headers
GNUSTEP_LOCAL_LIBRARIES=/Local/Library/Libraries
GNUSTEP_LOCAL_DOC=/Local/Library/Documentation
GNUSTEP_LOCAL_DOC_MAN=/Local/Library/Documentation/man
GNUSTEP_LOCAL_DOC_INFO=/Local/Library/Documentation/info
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
GNUSTEP_USER_DIR_WEB_APPS=GNUstep/Library/WebApplications

View file

@ -23,6 +23,13 @@
# by using ./configure --prefix=xxx when configuring.
GNUSTEP_DEFAULT_PREFIX=/usr/GNUstep
# These are only used by gnustep-base to implement the NSUserDirectory
# API. We never install anything in them. They will be used as they
# are without $prefix.
GNUSTEP_SYSTEM_USERS_DIR=/home
GNUSTEP_NETWORK_USERS_DIR=/home
GNUSTEP_LOCAL_USERS_DIR=/home
# NB: $prefix will be added to all the MAKEFILES/SYSTEM/NETWORK/LOCAL
# paths.
GNUSTEP_MAKEFILES=/System/Library/Makefiles

View file

@ -9,6 +9,13 @@
# configuring.
GNUSTEP_DEFAULT_PREFIX=/
# These are only used by gnustep-base to implement the NSUserDirectory
# API. We never install anything in them. They will be used as they
# are without $prefix.
GNUSTEP_SYSTEM_USERS_DIR=/Users
GNUSTEP_NETWORK_USERS_DIR=/Network/Users
GNUSTEP_LOCAL_USERS_DIR=/Users
# NB: $prefix will be added to all the MAKEFILES/SYSTEM/NETWORK/LOCAL
# paths.
GNUSTEP_MAKEFILES=/GNUDeveloper/Makefiles

View file

@ -98,6 +98,10 @@ reset_path PATH /Tools
# want to pollute the environment with it.
unset -f reset_path
unset GNUSTEP_SYSTEM_USERS_DIR
unset GNUSTEP_NETWORK_USERS_DIR
unset GNUSTEP_LOCAL_USERS_DIR
unset GNUSTEP_SYSTEM_APPS
unset GNUSTEP_SYSTEM_ADMIN_APPS
unset GNUSTEP_SYSTEM_WEB_APPS

View file

@ -52,6 +52,13 @@ GNUSTEP_USER_DEFAULTS_DIR=@GNUSTEP_USER_DEFAULTS_DIR@
GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
# This is where the user home directories are. Only used to provide
# NSUserDirectory in gnustep-base. Never used anywhere else.
GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@
GNUSTEP_NETWORK_USERS_DIR=@GNUSTEP_NETWORK_USERS_DIR@
GNUSTEP_LOCAL_USERS_DIR=@GNUSTEP_LOCAL_USERS_DIR@
# This is where System GUI Applications get installed.
# Traditionally it is /usr/GNUstep/System/Applications.
GNUSTEP_SYSTEM_APPS=@GNUSTEP_SYSTEM_APPS@

25
configure vendored
View file

@ -273,7 +273,7 @@ PACKAGE_BUGREPORT=
ac_unique_file="application.make"
ac_default_prefix=NONE
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_IS_FLATTENED GNUSTEP_SYSTEM_APPS GNUSTEP_SYSTEM_ADMIN_APPS GNUSTEP_SYSTEM_WEB_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_ADMIN_TOOLS GNUSTEP_SYSTEM_LIBRARY GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES GNUSTEP_SYSTEM_DOC GNUSTEP_SYSTEM_DOC_INFO GNUSTEP_SYSTEM_DOC_MAN GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_ADMIN_APPS GNUSTEP_NETWORK_WEB_APPS GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_ADMIN_TOOLS GNUSTEP_NETWORK_LIBRARY GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES GNUSTEP_NETWORK_DOC GNUSTEP_NETWORK_DOC_INFO GNUSTEP_NETWORK_DOC_MAN GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_ADMIN_APPS GNUSTEP_LOCAL_WEB_APPS GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_ADMIN_TOOLS GNUSTEP_LOCAL_LIBRARY GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES GNUSTEP_LOCAL_DOC GNUSTEP_LOCAL_DOC_INFO GNUSTEP_LOCAL_DOC_MAN GNUSTEP_USER_DIR_APPS GNUSTEP_USER_DIR_ADMIN_APPS GNUSTEP_USER_DIR_WEB_APPS GNUSTEP_USER_DIR_TOOLS GNUSTEP_USER_DIR_ADMIN_TOOLS GNUSTEP_USER_DIR_LIBRARY GNUSTEP_USER_DIR_HEADERS GNUSTEP_USER_DIR_LIBRARIES GNUSTEP_USER_DIR_DOC GNUSTEP_USER_DIR_DOC_INFO GNUSTEP_USER_DIR_DOC_MAN GNUSTEP_SYSTEM_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES GCC_WITH_PRECOMPILED_HEADERS SOLARIS_SHARED INCLUDES LIB_DIR OBJCFLAGS GNUMAKE MAKE_WITH_INFO_FUNCTION GNUSTEP_STRIP_MAKEFILES GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LATEX2HTML LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_IS_FLATTENED GNUSTEP_SYSTEM_APPS GNUSTEP_SYSTEM_ADMIN_APPS GNUSTEP_SYSTEM_WEB_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_ADMIN_TOOLS GNUSTEP_SYSTEM_LIBRARY GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES GNUSTEP_SYSTEM_DOC GNUSTEP_SYSTEM_DOC_INFO GNUSTEP_SYSTEM_DOC_MAN GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_ADMIN_APPS GNUSTEP_NETWORK_WEB_APPS GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_ADMIN_TOOLS GNUSTEP_NETWORK_LIBRARY GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES GNUSTEP_NETWORK_DOC GNUSTEP_NETWORK_DOC_INFO GNUSTEP_NETWORK_DOC_MAN GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_ADMIN_APPS GNUSTEP_LOCAL_WEB_APPS GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_ADMIN_TOOLS GNUSTEP_LOCAL_LIBRARY GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES GNUSTEP_LOCAL_DOC GNUSTEP_LOCAL_DOC_INFO GNUSTEP_LOCAL_DOC_MAN GNUSTEP_USER_DIR_APPS GNUSTEP_USER_DIR_ADMIN_APPS GNUSTEP_USER_DIR_WEB_APPS GNUSTEP_USER_DIR_TOOLS GNUSTEP_USER_DIR_ADMIN_TOOLS GNUSTEP_USER_DIR_LIBRARY GNUSTEP_USER_DIR_HEADERS GNUSTEP_USER_DIR_LIBRARIES GNUSTEP_USER_DIR_DOC GNUSTEP_USER_DIR_DOC_INFO GNUSTEP_USER_DIR_DOC_MAN GNUSTEP_SYSTEM_USERS_DIR GNUSTEP_NETWORK_USERS_DIR GNUSTEP_LOCAL_USERS_DIR GNUSTEP_SYSTEM_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES GCC_WITH_PRECOMPILED_HEADERS SOLARIS_SHARED INCLUDES LIB_DIR OBJCFLAGS GNUMAKE MAKE_WITH_INFO_FUNCTION GNUSTEP_STRIP_MAKEFILES GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LATEX2HTML LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -3405,7 +3405,9 @@ GNUSTEP_PREFIX="`echo \"$GNUSTEP_PREFIX\" | sed 's%/*$%%'`"
echo "$as_me:$LINENO: result: $GNUSTEP_PREFIX" >&5
echo "${ECHO_T}$GNUSTEP_PREFIX" >&6
# Now we apply the prefix
# Now we apply the prefix (we don't need to apply it to
# GNUSTEP_SYSTEM_USERS_DIR and similar, which are something like
# '/home' - we never install anything in there).
GNUSTEP_MAKEFILES="$GNUSTEP_PREFIX$GNUSTEP_MAKEFILES"
GNUSTEP_SYSTEM_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_APPS"
@ -3981,6 +3983,22 @@ echo "$as_me:$LINENO: result: $GNUSTEP_USER_DIR_DOC_MAN" >&5
echo "${ECHO_T}$GNUSTEP_USER_DIR_DOC_MAN" >&6
echo "$as_me:$LINENO: checking for System User directory" >&5
echo $ECHO_N "checking for System User directory... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $GNUSTEP_SYSTEM_USERS_DIR" >&5
echo "${ECHO_T}$GNUSTEP_SYSTEM_USERS_DIR" >&6
echo "$as_me:$LINENO: checking for Network User directory" >&5
echo $ECHO_N "checking for Network User directory... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $GNUSTEP_NETWORK_USERS_DIR" >&5
echo "${ECHO_T}$GNUSTEP_NETWORK_USERS_DIR" >&6
echo "$as_me:$LINENO: checking for Local User directory" >&5
echo $ECHO_N "checking for Local User directory... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $GNUSTEP_LOCAL_USERS_DIR" >&5
echo "${ECHO_T}$GNUSTEP_LOCAL_USERS_DIR" >&6
#--------------------------------------------------------------------
# These variables no longer exist! We try to set some compatibility
# values for them that should work with the old 'gnustep' layout.
@ -5703,6 +5721,9 @@ s,@GNUSTEP_USER_DIR_LIBRARIES@,$GNUSTEP_USER_DIR_LIBRARIES,;t t
s,@GNUSTEP_USER_DIR_DOC@,$GNUSTEP_USER_DIR_DOC,;t t
s,@GNUSTEP_USER_DIR_DOC_INFO@,$GNUSTEP_USER_DIR_DOC_INFO,;t t
s,@GNUSTEP_USER_DIR_DOC_MAN@,$GNUSTEP_USER_DIR_DOC_MAN,;t t
s,@GNUSTEP_SYSTEM_USERS_DIR@,$GNUSTEP_SYSTEM_USERS_DIR,;t t
s,@GNUSTEP_NETWORK_USERS_DIR@,$GNUSTEP_NETWORK_USERS_DIR,;t t
s,@GNUSTEP_LOCAL_USERS_DIR@,$GNUSTEP_LOCAL_USERS_DIR,;t t
s,@GNUSTEP_SYSTEM_ROOT@,$GNUSTEP_SYSTEM_ROOT,;t t
s,@GNUSTEP_NETWORK_ROOT@,$GNUSTEP_NETWORK_ROOT,;t t
s,@GNUSTEP_LOCAL_ROOT@,$GNUSTEP_LOCAL_ROOT,;t t

View file

@ -295,7 +295,9 @@ GNUSTEP_PREFIX="`echo \"$GNUSTEP_PREFIX\" | sed 's%/*$%%'`"
AC_MSG_RESULT($GNUSTEP_PREFIX)
# Now we apply the prefix
# Now we apply the prefix (we don't need to apply it to
# GNUSTEP_SYSTEM_USERS_DIR and similar, which are something like
# '/home' - we never install anything in there).
GNUSTEP_MAKEFILES="$GNUSTEP_PREFIX$GNUSTEP_MAKEFILES"
GNUSTEP_SYSTEM_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_APPS"
@ -795,6 +797,16 @@ AC_MSG_CHECKING([for User Man Documentation directory])
AC_MSG_RESULT($GNUSTEP_USER_DIR_DOC_MAN)
AC_SUBST(GNUSTEP_USER_DIR_DOC_MAN)
AC_MSG_CHECKING([for System User directory])
AC_MSG_RESULT($GNUSTEP_SYSTEM_USERS_DIR)
AC_SUBST(GNUSTEP_SYSTEM_USERS_DIR)
AC_MSG_CHECKING([for Network User directory])
AC_MSG_RESULT($GNUSTEP_NETWORK_USERS_DIR)
AC_SUBST(GNUSTEP_NETWORK_USERS_DIR)
AC_MSG_CHECKING([for Local User directory])
AC_MSG_RESULT($GNUSTEP_LOCAL_USERS_DIR)
AC_SUBST(GNUSTEP_LOCAL_USERS_DIR)
#--------------------------------------------------------------------
# These variables no longer exist! We try to set some compatibility
# values for them that should work with the old 'gnustep' layout.

View file

@ -29,6 +29,19 @@
# IMPORTANT: tcsh v6.12 has a maximum variable size of 30 characters.
# So all variables should have names that are below that size.
#
# Location of Users directories ... never used by gnustep-make.
#
if ( ! ${?GNUSTEP_SYSTEM_USERS_DIR} ) then
setenv GNUSTEP_SYSTEM_USERS_DIR "@GNUSTEP_SYSTEM_USERS_DIR@"
endif
if ( ! ${?GNUSTEP_NETWORK_USERS_DIR} ) then
setenv GNUSTEP_NETWORK_USERS_DIR "@GNUSTEP_NETWORK_USERS_DIR@"
endif
if ( ! ${?GNUSTEP_LOCAL_USERS_DIR} ) then
setenv GNUSTEP_LOCAL_USERS_DIR "@GNUSTEP_LOCAL_USERS_DIR@"
endif
#
# SYSTEM domain
#

View file

@ -44,84 +44,91 @@
# everyone.
#
#
# Location of Users directories ... never used by gnustep-make.
#
GNUSTEP_SYSTEM_USERS_DIR ?= @GNUSTEP_SYSTEM_USERS_DIR@
GNUSTEP_LOCAL_USERS_DIR ?= @GNUSTEP_LOCAL_USERS_DIR@
GNUSTEP_NETWORK_USERS_DIR ?= @GNUSTEP_NETWORK_USERS_DIR@
#
# SYSTEM domain
#
GNUSTEP_SYSTEM_APPS ?= @GNUSTEP_SYSTEM_APPS@
GNUSTEP_SYSTEM_ADMIN_APPS ?= @GNUSTEP_SYSTEM_ADMIN_APPS@
GNUSTEP_SYSTEM_WEB_APPS ?= @GNUSTEP_SYSTEM_WEB_APPS@
GNUSTEP_SYSTEM_TOOLS ?= @GNUSTEP_SYSTEM_TOOLS@
GNUSTEP_SYSTEM_ADMIN_TOOLS ?= @GNUSTEP_SYSTEM_ADMIN_TOOLS@
GNUSTEP_SYSTEM_LIBRARY ?= @GNUSTEP_SYSTEM_LIBRARY@
GNUSTEP_SYSTEM_HEADERS ?= @GNUSTEP_SYSTEM_HEADERS@
GNUSTEP_SYSTEM_LIBRARIES ?= @GNUSTEP_SYSTEM_LIBRARIES@
GNUSTEP_SYSTEM_DOC ?= @GNUSTEP_SYSTEM_DOC@
GNUSTEP_SYSTEM_DOC_MAN ?= @GNUSTEP_SYSTEM_DOC_MAN@
GNUSTEP_SYSTEM_DOC_INFO ?= @GNUSTEP_SYSTEM_DOC_INFO@
GNUSTEP_SYSTEM_APPS ?= @GNUSTEP_SYSTEM_APPS@
GNUSTEP_SYSTEM_ADMIN_APPS ?= @GNUSTEP_SYSTEM_ADMIN_APPS@
GNUSTEP_SYSTEM_WEB_APPS ?= @GNUSTEP_SYSTEM_WEB_APPS@
GNUSTEP_SYSTEM_TOOLS ?= @GNUSTEP_SYSTEM_TOOLS@
GNUSTEP_SYSTEM_ADMIN_TOOLS ?= @GNUSTEP_SYSTEM_ADMIN_TOOLS@
GNUSTEP_SYSTEM_LIBRARY ?= @GNUSTEP_SYSTEM_LIBRARY@
GNUSTEP_SYSTEM_HEADERS ?= @GNUSTEP_SYSTEM_HEADERS@
GNUSTEP_SYSTEM_LIBRARIES ?= @GNUSTEP_SYSTEM_LIBRARIES@
GNUSTEP_SYSTEM_DOC ?= @GNUSTEP_SYSTEM_DOC@
GNUSTEP_SYSTEM_DOC_MAN ?= @GNUSTEP_SYSTEM_DOC_MAN@
GNUSTEP_SYSTEM_DOC_INFO ?= @GNUSTEP_SYSTEM_DOC_INFO@
#
# SYSTEM domain, variables that are fixed to subdirs of LIBRARY
#
GNUSTEP_SYSTEM_APPLICATION_SUPPORT = $(GNUSTEP_SYSTEM_LIBRARY)/ApplicationSupport
GNUSTEP_SYSTEM_BUNDLES = $(GNUSTEP_SYSTEM_LIBRARY)/Bundles
GNUSTEP_SYSTEM_FRAMEWORKS = $(GNUSTEP_SYSTEM_LIBRARY)/Frameworks
GNUSTEP_SYSTEM_PALETTES = $(GNUSTEP_SYSTEM_LIBRARY)/ApplicationSupport/Palettes
GNUSTEP_SYSTEM_SERVICES = $(GNUSTEP_SYSTEM_LIBRARY)/Services
GNUSTEP_SYSTEM_RESOURCES = $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Resources
GNUSTEP_SYSTEM_JAVA = $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Java
GNUSTEP_SYSTEM_APPLICATION_SUPPORT = $(GNUSTEP_SYSTEM_LIBRARY)/ApplicationSupport
GNUSTEP_SYSTEM_BUNDLES = $(GNUSTEP_SYSTEM_LIBRARY)/Bundles
GNUSTEP_SYSTEM_FRAMEWORKS = $(GNUSTEP_SYSTEM_LIBRARY)/Frameworks
GNUSTEP_SYSTEM_PALETTES = $(GNUSTEP_SYSTEM_LIBRARY)/ApplicationSupport/Palettes
GNUSTEP_SYSTEM_SERVICES = $(GNUSTEP_SYSTEM_LIBRARY)/Services
GNUSTEP_SYSTEM_RESOURCES = $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Resources
GNUSTEP_SYSTEM_JAVA = $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Java
#
# NETWORK domain
#
GNUSTEP_NETWORK_APPS ?= @GNUSTEP_NETWORK_APPS@
GNUSTEP_NETWORK_ADMIN_APPS ?= @GNUSTEP_NETWORK_ADMIN_APPS@
GNUSTEP_NETWORK_WEB_APPS ?= @GNUSTEP_NETWORK_WEB_APPS@
GNUSTEP_NETWORK_TOOLS ?= @GNUSTEP_NETWORK_TOOLS@
GNUSTEP_NETWORK_ADMIN_TOOLS ?= @GNUSTEP_NETWORK_ADMIN_TOOLS@
GNUSTEP_NETWORK_LIBRARY ?= @GNUSTEP_NETWORK_LIBRARY@
GNUSTEP_NETWORK_HEADERS ?= @GNUSTEP_NETWORK_HEADERS@
GNUSTEP_NETWORK_LIBRARIES ?= @GNUSTEP_NETWORK_LIBRARIES@
GNUSTEP_NETWORK_DOC ?= @GNUSTEP_NETWORK_DOC@
GNUSTEP_NETWORK_DOC_MAN ?= @GNUSTEP_NETWORK_DOC_MAN@
GNUSTEP_NETWORK_DOC_INFO ?= @GNUSTEP_NETWORK_DOC_INFO@
GNUSTEP_NETWORK_APPS ?= @GNUSTEP_NETWORK_APPS@
GNUSTEP_NETWORK_ADMIN_APPS ?= @GNUSTEP_NETWORK_ADMIN_APPS@
GNUSTEP_NETWORK_WEB_APPS ?= @GNUSTEP_NETWORK_WEB_APPS@
GNUSTEP_NETWORK_TOOLS ?= @GNUSTEP_NETWORK_TOOLS@
GNUSTEP_NETWORK_ADMIN_TOOLS ?= @GNUSTEP_NETWORK_ADMIN_TOOLS@
GNUSTEP_NETWORK_LIBRARY ?= @GNUSTEP_NETWORK_LIBRARY@
GNUSTEP_NETWORK_HEADERS ?= @GNUSTEP_NETWORK_HEADERS@
GNUSTEP_NETWORK_LIBRARIES ?= @GNUSTEP_NETWORK_LIBRARIES@
GNUSTEP_NETWORK_DOC ?= @GNUSTEP_NETWORK_DOC@
GNUSTEP_NETWORK_DOC_MAN ?= @GNUSTEP_NETWORK_DOC_MAN@
GNUSTEP_NETWORK_DOC_INFO ?= @GNUSTEP_NETWORK_DOC_INFO@
#
# NETWORK domain, variables that are fixed to subdirs of LIBRARY
#
GNUSTEP_NETWORK_APPLICATION_SUPPORT = $(GNUSTEP_NETWORK_LIBRARY)/ApplicationSupport
GNUSTEP_NETWORK_BUNDLES = $(GNUSTEP_NETWORK_LIBRARY)/Bundles
GNUSTEP_NETWORK_FRAMEWORKS = $(GNUSTEP_NETWORK_LIBRARY)/Frameworks
GNUSTEP_NETWORK_PALETTES = $(GNUSTEP_NETWORK_LIBRARY)/ApplicationSupport/Palettes
GNUSTEP_NETWORK_SERVICES = $(GNUSTEP_NETWORK_LIBRARY)/Services
GNUSTEP_NETWORK_RESOURCES = $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Resources
GNUSTEP_NETWORK_JAVA = $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Java
GNUSTEP_NETWORK_APPLICATION_SUPPORT = $(GNUSTEP_NETWORK_LIBRARY)/ApplicationSupport
GNUSTEP_NETWORK_BUNDLES = $(GNUSTEP_NETWORK_LIBRARY)/Bundles
GNUSTEP_NETWORK_FRAMEWORKS = $(GNUSTEP_NETWORK_LIBRARY)/Frameworks
GNUSTEP_NETWORK_PALETTES = $(GNUSTEP_NETWORK_LIBRARY)/ApplicationSupport/Palettes
GNUSTEP_NETWORK_SERVICES = $(GNUSTEP_NETWORK_LIBRARY)/Services
GNUSTEP_NETWORK_RESOURCES = $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Resources
GNUSTEP_NETWORK_JAVA = $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Java
#
# LOCAL domain
#
GNUSTEP_LOCAL_APPS ?= @GNUSTEP_LOCAL_APPS@
GNUSTEP_LOCAL_ADMIN_APPS ?= @GNUSTEP_LOCAL_ADMIN_APPS@
GNUSTEP_LOCAL_WEB_APPS ?= @GNUSTEP_LOCAL_WEB_APPS@
GNUSTEP_LOCAL_TOOLS ?= @GNUSTEP_LOCAL_TOOLS@
GNUSTEP_LOCAL_ADMIN_TOOLS ?= @GNUSTEP_LOCAL_ADMIN_TOOLS@
GNUSTEP_LOCAL_LIBRARY ?= @GNUSTEP_LOCAL_LIBRARY@
GNUSTEP_LOCAL_HEADERS ?= @GNUSTEP_LOCAL_HEADERS@
GNUSTEP_LOCAL_LIBRARIES ?= @GNUSTEP_LOCAL_LIBRARIES@
GNUSTEP_LOCAL_DOC ?= @GNUSTEP_LOCAL_DOC@
GNUSTEP_LOCAL_DOC_MAN ?= @GNUSTEP_LOCAL_DOC_MAN@
GNUSTEP_LOCAL_DOC_INFO ?= @GNUSTEP_LOCAL_DOC_INFO@
GNUSTEP_LOCAL_APPS ?= @GNUSTEP_LOCAL_APPS@
GNUSTEP_LOCAL_ADMIN_APPS ?= @GNUSTEP_LOCAL_ADMIN_APPS@
GNUSTEP_LOCAL_WEB_APPS ?= @GNUSTEP_LOCAL_WEB_APPS@
GNUSTEP_LOCAL_TOOLS ?= @GNUSTEP_LOCAL_TOOLS@
GNUSTEP_LOCAL_ADMIN_TOOLS ?= @GNUSTEP_LOCAL_ADMIN_TOOLS@
GNUSTEP_LOCAL_LIBRARY ?= @GNUSTEP_LOCAL_LIBRARY@
GNUSTEP_LOCAL_HEADERS ?= @GNUSTEP_LOCAL_HEADERS@
GNUSTEP_LOCAL_LIBRARIES ?= @GNUSTEP_LOCAL_LIBRARIES@
GNUSTEP_LOCAL_DOC ?= @GNUSTEP_LOCAL_DOC@
GNUSTEP_LOCAL_DOC_MAN ?= @GNUSTEP_LOCAL_DOC_MAN@
GNUSTEP_LOCAL_DOC_INFO ?= @GNUSTEP_LOCAL_DOC_INFO@
#
# LOCAL domain, variables that are fixed to subdirs of LIBRARY
#
GNUSTEP_LOCAL_APPLICATION_SUPPORT = $(GNUSTEP_LOCAL_LIBRARY)/ApplicationSupport
GNUSTEP_LOCAL_BUNDLES = $(GNUSTEP_LOCAL_LIBRARY)/Bundles
GNUSTEP_LOCAL_FRAMEWORKS = $(GNUSTEP_LOCAL_LIBRARY)/Frameworks
GNUSTEP_LOCAL_PALETTES = $(GNUSTEP_LOCAL_LIBRARY)/ApplicationSupport/Palettes
GNUSTEP_LOCAL_SERVICES = $(GNUSTEP_LOCAL_LIBRARY)/Services
GNUSTEP_LOCAL_RESOURCES = $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Resources
GNUSTEP_LOCAL_JAVA = $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Java
GNUSTEP_LOCAL_APPLICATION_SUPPORT = $(GNUSTEP_LOCAL_LIBRARY)/ApplicationSupport
GNUSTEP_LOCAL_BUNDLES = $(GNUSTEP_LOCAL_LIBRARY)/Bundles
GNUSTEP_LOCAL_FRAMEWORKS = $(GNUSTEP_LOCAL_LIBRARY)/Frameworks
GNUSTEP_LOCAL_PALETTES = $(GNUSTEP_LOCAL_LIBRARY)/ApplicationSupport/Palettes
GNUSTEP_LOCAL_SERVICES = $(GNUSTEP_LOCAL_LIBRARY)/Services
GNUSTEP_LOCAL_RESOURCES = $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Resources
GNUSTEP_LOCAL_JAVA = $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Java
#
@ -130,17 +137,17 @@ GNUSTEP_LOCAL_JAVA = $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Java
# which we convert into the actual GNUSTEP_USER_* after prepending (if needed)
# GNUSTEP_HOME.
#
GNUSTEP_USER_DIR_APPS ?= @GNUSTEP_USER_DIR_APPS@
GNUSTEP_USER_DIR_ADMIN_APPS ?= @GNUSTEP_USER_DIR_ADMIN_APPS@
GNUSTEP_USER_DIR_WEB_APPS ?= @GNUSTEP_USER_DIR_WEB_APPS@
GNUSTEP_USER_DIR_TOOLS ?= @GNUSTEP_USER_DIR_TOOLS@
GNUSTEP_USER_DIR_ADMIN_TOOLS ?= @GNUSTEP_USER_DIR_ADMIN_TOOLS@
GNUSTEP_USER_DIR_LIBRARY ?= @GNUSTEP_USER_DIR_LIBRARY@
GNUSTEP_USER_DIR_HEADERS ?= @GNUSTEP_USER_DIR_HEADERS@
GNUSTEP_USER_DIR_LIBRARIES ?= @GNUSTEP_USER_DIR_LIBRARIES@
GNUSTEP_USER_DIR_DOC ?= @GNUSTEP_USER_DIR_DOC@
GNUSTEP_USER_DIR_DOC_MAN ?= @GNUSTEP_USER_DIR_DOC_MAN@
GNUSTEP_USER_DIR_DOC_INFO ?= @GNUSTEP_USER_DIR_DOC_INFO@
GNUSTEP_USER_DIR_APPS ?= @GNUSTEP_USER_DIR_APPS@
GNUSTEP_USER_DIR_ADMIN_APPS ?= @GNUSTEP_USER_DIR_ADMIN_APPS@
GNUSTEP_USER_DIR_WEB_APPS ?= @GNUSTEP_USER_DIR_WEB_APPS@
GNUSTEP_USER_DIR_TOOLS ?= @GNUSTEP_USER_DIR_TOOLS@
GNUSTEP_USER_DIR_ADMIN_TOOLS ?= @GNUSTEP_USER_DIR_ADMIN_TOOLS@
GNUSTEP_USER_DIR_LIBRARY ?= @GNUSTEP_USER_DIR_LIBRARY@
GNUSTEP_USER_DIR_HEADERS ?= @GNUSTEP_USER_DIR_HEADERS@
GNUSTEP_USER_DIR_LIBRARIES ?= @GNUSTEP_USER_DIR_LIBRARIES@
GNUSTEP_USER_DIR_DOC ?= @GNUSTEP_USER_DIR_DOC@
GNUSTEP_USER_DIR_DOC_MAN ?= @GNUSTEP_USER_DIR_DOC_MAN@
GNUSTEP_USER_DIR_DOC_INFO ?= @GNUSTEP_USER_DIR_DOC_INFO@
# Now, any directories in the user domain that are relative (ie, they
# don't start with '/') get automatically prefixed with GNUSTEP_HOME.
@ -221,10 +228,12 @@ endif
#
# USER domain, variables that are fixed to subdirs of LIBRARY
#
GNUSTEP_USER_APPLICATION_SUPPORT = $(GNUSTEP_USER_LIBRARY)/ApplicationSupport
GNUSTEP_USER_BUNDLES = $(GNUSTEP_USER_LIBRARY)/Bundles
GNUSTEP_USER_FRAMEWORKS = $(GNUSTEP_USER_LIBRARY)/Frameworks
GNUSTEP_USER_PALETTES = $(GNUSTEP_USER_LIBRARY)/ApplicationSupport/Palettes
GNUSTEP_USER_SERVICES = $(GNUSTEP_USER_LIBRARY)/Services
GNUSTEP_USER_RESOURCES = $(GNUSTEP_USER_LIBRARY)/Libraries/Resources
GNUSTEP_USER_JAVA = $(GNUSTEP_USER_LIBRARY)/Libraries/Java
GNUSTEP_USER_APPLICATION_SUPPORT = $(GNUSTEP_USER_LIBRARY)/ApplicationSupport
GNUSTEP_USER_BUNDLES = $(GNUSTEP_USER_LIBRARY)/Bundles
GNUSTEP_USER_FRAMEWORKS = $(GNUSTEP_USER_LIBRARY)/Frameworks
GNUSTEP_USER_PALETTES = $(GNUSTEP_USER_LIBRARY)/ApplicationSupport/Palettes
GNUSTEP_USER_SERVICES = $(GNUSTEP_USER_LIBRARY)/Services
GNUSTEP_USER_RESOURCES = $(GNUSTEP_USER_LIBRARY)/Libraries/Resources
GNUSTEP_USER_JAVA = $(GNUSTEP_USER_LIBRARY)/Libraries/Java

View file

@ -32,6 +32,20 @@
# GNUSTEP_INSTALLATION_DIR is set.
#
#
# Location of Users directories ... never used by gnustep-make.
#
if [ -z "$GNUSTEP_SYSTEM_USERS_DIR" ];
then GNUSTEP_SYSTEM_USERS_DIR="@GNUSTEP_SYSTEM_USERS_DIR@"
fi
if [ -z "$GNUSTEP_NETWORK_USERS_DIR" ];
then GNUSTEP_NETWORK_USERS_DIR="@GNUSTEP_NETWORK_USERS_DIR@"
fi
if [ -z "$GNUSTEP_LOCAL_USERS_DIR" ];
then GNUSTEP_LOCAL_USERS_DIR="@GNUSTEP_LOCAL_USERS_DIR@"
fi
# PS: We don't want to define these variables to avoid extreme
# environment pollution. :-) They are fixed subdirs of LIBRARY if you
# need them.