mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
More work on general filesystem layout support
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24532 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
a95cc28db6
commit
d656596e1d
11 changed files with 1082 additions and 295 deletions
30
ChangeLog
30
ChangeLog
|
|
@ -1,3 +1,33 @@
|
|||
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Warning: the software will be instable for some time. Don't
|
||||
upgrade from trunk if you need stability.
|
||||
* configure.ac: Set default values for GNUSTEP_SYSTEM_TOOLS,
|
||||
GNUSTEP_SYSTEM_APPS, GNUSTEP_SYSTEM_LIBRARY, etc. variables and
|
||||
export them. Create filesystem.make, filesystem.sh and
|
||||
filesystem.csh.
|
||||
* configure: Regenerated.
|
||||
* filesystem.make: Moved into filesystem.make.in.
|
||||
* filesystem.make.in: All variables: get them from configure
|
||||
defaults if not set so that GNUSTEP_*_ROOT are never needed or
|
||||
referenced. Made GNUSTEP_*_RESOURCES and GNUSTEP_*_JAVA fixed
|
||||
subdirs of GNUSTEP_*_LIBRARY. For all directories in the user
|
||||
domain, prefix them with GNUSTEP_HOME if they seem relative.
|
||||
* filesystem.sh: Moved into filesystem.sh.in.
|
||||
* filesystem.sh.in: Same changes as filesystem.make.in.
|
||||
* filesystem.csh.in: New file
|
||||
* GNUmakefile.in (install): Install filesystem.csh
|
||||
(filesystem.make): Added rule to rebuild it.
|
||||
(filesystem.sh): Added rule to rebuild it.
|
||||
(filesystem.csh): Added rule to rebuild it.
|
||||
(distclean): Remove the filesystem.* files.
|
||||
(generated-files): Add filesystem.make, filesystem.sh,
|
||||
filesystem.csh.
|
||||
* GNUstep.sh.in: Do not unset or export GNUSTEP_*_RESOURCES and
|
||||
GNUSTEP_*_JAVA.
|
||||
* GNUstep.csh.in: Source filesystem.csh.in; at the end unset all
|
||||
variables set there.
|
||||
|
||||
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>,
|
||||
|
||||
* GNUstep.csh.in: Fixed bug in setting GUILE_LOAD_PATH.
|
||||
|
|
|
|||
|
|
@ -156,6 +156,7 @@ install: generated-files
|
|||
$(INSTALL_PROGRAM) -m 755 GNUstep.csh $(makedir); \
|
||||
$(INSTALL_PROGRAM) -m 755 fixpath.sh $(makedir); \
|
||||
$(INSTALL_PROGRAM) -m 755 filesystem.sh $(makedir); \
|
||||
$(INSTALL_PROGRAM) -m 755 filesystem.csh $(makedir); \
|
||||
$(INSTALL_PROGRAM) -m 755 openapp $(tooldir); \
|
||||
$(INSTALL_PROGRAM) -m 755 opentool $(tooldir); \
|
||||
$(INSTALL_PROGRAM) -m 755 gnustep-config $(tooldir))
|
||||
|
|
@ -252,6 +253,7 @@ distclean: clean
|
|||
rm -f config.cache config.log config.status
|
||||
rm -f openapp opentool executable.template
|
||||
rm -f GNUstep.sh GNUstep.csh fixpath.sh gnustep-config
|
||||
rm -f filesystem.make filesystem.sh filesystem.csh
|
||||
rm -f gnustep-make.spec GNUsteprc
|
||||
rm -f config-precomp-test.log
|
||||
|
||||
|
|
@ -313,7 +315,9 @@ rpm: test-RPM_TOPDIR dist
|
|||
fi; \
|
||||
$${rpmbuild} -ba gnustep-make.spec
|
||||
|
||||
generated-files: GNUmakefile GNUstep.sh GNUstep.csh fixpath.sh config-noarch.make config.make openapp opentool gnustep-make.spec executable.template gnustep-config
|
||||
generated-files: GNUmakefile GNUstep.sh GNUstep.csh fixpath.sh config-noarch.make config.make \
|
||||
openapp opentool gnustep-make.spec executable.template gnustep-config \
|
||||
filesystem.make filesystem.sh filesystem.csh
|
||||
|
||||
GNUmakefile: GNUmakefile.in config.status
|
||||
$(SHELL) config.status
|
||||
|
|
@ -327,6 +331,15 @@ GNUstep.csh: GNUstep.csh.in
|
|||
fixpath.sh: fixpath.sh.in
|
||||
$(SHELL) config.status
|
||||
|
||||
filesystem.make: filesystem.make.in
|
||||
$(SHELL) config.status
|
||||
|
||||
filesystem.sh: filesystem.sh.in
|
||||
$(SHELL) config.status
|
||||
|
||||
filesystem.csh: filesystem.csh.in
|
||||
$(SHELL) config.status
|
||||
|
||||
config-noarch.make: config-noarch.make.in Version
|
||||
$(SHELL) config.status --recheck
|
||||
|
||||
|
|
|
|||
|
|
@ -135,9 +135,6 @@ switch ("${GNUSTEP_USER_DIR}")
|
|||
breaksw
|
||||
endsw
|
||||
|
||||
# No longer needed
|
||||
unset GNUSTEP_HOME
|
||||
|
||||
if ( "@GNUSTEP_MULTI_PLATFORM@" == "" ) then
|
||||
setenv GNUSTEP_HOST "@target@"
|
||||
setenv GNUSTEP_HOST_CPU "@clean_target_cpu@"
|
||||
|
|
@ -170,6 +167,12 @@ if ( ! ${?GNUSTEP_HOST_OS} ) then
|
|||
setenv GNUSTEP_HOST_OS `${GNUSTEP_MAKEFILES}/clean_os.sh ${GNUSTEP_HOST_OS}`
|
||||
endif
|
||||
|
||||
# Now load in all the remaining paths
|
||||
source "${GNUSTEP_MAKEFILES}/filesystem.csh"
|
||||
|
||||
# No longer needed
|
||||
unset GNUSTEP_HOME
|
||||
|
||||
#
|
||||
# Add the GNUstep tools directories to the path
|
||||
#
|
||||
|
|
@ -234,3 +237,38 @@ if ( -e "$GNUSTEP_USER_ROOT/GNUstep.csh" ) then
|
|||
source "$GNUSTEP_USER_ROOT/GNUstep.csh"
|
||||
endif
|
||||
|
||||
unset GNUSTEP_SYSTEM_APPS
|
||||
unset GNUSTEP_SYSTEM_TOOLS
|
||||
unset GNUSTEP_SYSTEM_LIBRARY
|
||||
unset GNUSTEP_SYSTEM_HEADERS
|
||||
unset GNUSTEP_SYSTEM_LIBRARIES
|
||||
unset GNUSTEP_SYSTEM_DOCUMENTATION
|
||||
unset GNUSTEP_SYSTEM_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_SYSTEM_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_LOCAL_APPS
|
||||
unset GNUSTEP_LOCAL_TOOLS
|
||||
unset GNUSTEP_LOCAL_LIBRARY
|
||||
unset GNUSTEP_LOCAL_HEADERS
|
||||
unset GNUSTEP_LOCAL_LIBRARIES
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_NETWORK_APPS
|
||||
unset GNUSTEP_NETWORK_TOOLS
|
||||
unset GNUSTEP_NETWORK_LIBRARY
|
||||
unset GNUSTEP_NETWORK_HEADERS
|
||||
unset GNUSTEP_NETWORK_LIBRARIES
|
||||
unset GNUSTEP_NETWORK_DOCUMENTATION
|
||||
unset GNUSTEP_NETWORK_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_NETWORK_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_USER_APPS
|
||||
unset GNUSTEP_USER_TOOLS
|
||||
unset GNUSTEP_USER_LIBRARY
|
||||
unset GNUSTEP_USER_HEADERS
|
||||
unset GNUSTEP_USER_LIBRARIES
|
||||
unset GNUSTEP_USER_DOCUMENTATION
|
||||
unset GNUSTEP_USER_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_USER_DOCUMENTATION_INFO
|
||||
|
|
@ -155,9 +155,6 @@ esac
|
|||
|
||||
export GNUSTEP_USER_ROOT
|
||||
|
||||
# No longer needed
|
||||
unset GNUSTEP_HOME
|
||||
|
||||
# If multi-platform support is disabled, just use the hardcoded cpu,
|
||||
# vendor and os determined when gnustep-make was configured. The
|
||||
# reason using the hardcoded ones might be better is that config.guess
|
||||
|
|
@ -207,6 +204,9 @@ export GNUSTEP_HOST GNUSTEP_HOST_CPU GNUSTEP_HOST_VENDOR GNUSTEP_HOST_OS
|
|||
# Now load in all the remaining paths
|
||||
. $GNUSTEP_MAKEFILES/filesystem.sh
|
||||
|
||||
# No longer needed
|
||||
unset GNUSTEP_HOME
|
||||
|
||||
#
|
||||
# TODO: From here on, we need to update all code to use the new filesystem
|
||||
# variables rather than using hardcoded library/java/info/etc locations
|
||||
|
|
@ -416,19 +416,19 @@ fi
|
|||
#
|
||||
if [ -n "$GNUSTEP_SH_EXPORT_ALL_VARIABLES" ]; then
|
||||
export GNUSTEP_SYSTEM_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_LIBRARY
|
||||
export GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES GNUSTEP_SYSTEM_RESOURCES GNUSTEP_SYSTEM_JAVA
|
||||
export GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES
|
||||
export GNUSTEP_SYSTEM_DOCUMENTATION GNUSTEP_SYSTEM_DOCUMENTATION_MAN GNUSTEP_SYSTEM_DOCUMENTATION_INFO
|
||||
|
||||
export GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_LIBRARY
|
||||
export GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES GNUSTEP_LOCAL_RESOURCES GNUSTEP_LOCAL_JAVA
|
||||
export GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES
|
||||
export GNUSTEP_LOCAL_DOCUMENTATION GNUSTEP_LOCAL_DOCUMENTATION_MAN GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
||||
export GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_LIBRARY
|
||||
export GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES GNUSTEP_NETWORK_RESOURCES GNUSTEP_NETWORK_JAVA
|
||||
export GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES
|
||||
export GNUSTEP_NETWORK_DOCUMENTATION GNUSTEP_NETWORK_DOCUMENTATION_MAN GNUSTEP_NETWORK_DOCUMENTATION_INFO
|
||||
|
||||
export GNUSTEP_USER_APPS GNUSTEP_USER_TOOLS GNUSTEP_USER_LIBRARY
|
||||
export GNUSTEP_USER_HEADERS GNUSTEP_USER_LIBRARIES GNUSTEP_USER_RESOURCES GNUSTEP_USER_JAVA
|
||||
export GNUSTEP_USER_HEADERS GNUSTEP_USER_LIBRARIES
|
||||
export GNUSTEP_USER_DOCUMENTATION GNUSTEP_USER_DOCUMENTATION_MAN GNUSTEP_USER_DOCUMENTATION_INFO
|
||||
else
|
||||
unset GNUSTEP_SYSTEM_APPS
|
||||
|
|
@ -436,8 +436,6 @@ else
|
|||
unset GNUSTEP_SYSTEM_LIBRARY
|
||||
unset GNUSTEP_SYSTEM_HEADERS
|
||||
unset GNUSTEP_SYSTEM_LIBRARIES
|
||||
unset GNUSTEP_SYSTEM_RESOURCES
|
||||
unset GNUSTEP_SYSTEM_JAVA
|
||||
unset GNUSTEP_SYSTEM_DOCUMENTATION
|
||||
unset GNUSTEP_SYSTEM_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_SYSTEM_DOCUMENTATION_INFO
|
||||
|
|
@ -447,8 +445,6 @@ else
|
|||
unset GNUSTEP_LOCAL_LIBRARY
|
||||
unset GNUSTEP_LOCAL_HEADERS
|
||||
unset GNUSTEP_LOCAL_LIBRARIES
|
||||
unset GNUSTEP_LOCAL_RESOURCES
|
||||
unset GNUSTEP_LOCAL_JAVA
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
|
@ -458,8 +454,6 @@ else
|
|||
unset GNUSTEP_NETWORK_LIBRARY
|
||||
unset GNUSTEP_NETWORK_HEADERS
|
||||
unset GNUSTEP_NETWORK_LIBRARIES
|
||||
unset GNUSTEP_NETWORK_RESOURCES
|
||||
unset GNUSTEP_NETWORK_JAVA
|
||||
unset GNUSTEP_NETWORK_DOCUMENTATION
|
||||
unset GNUSTEP_NETWORK_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_NETWORK_DOCUMENTATION_INFO
|
||||
|
|
@ -469,8 +463,6 @@ else
|
|||
unset GNUSTEP_USER_LIBRARY
|
||||
unset GNUSTEP_USER_HEADERS
|
||||
unset GNUSTEP_USER_LIBRARIES
|
||||
unset GNUSTEP_USER_RESOURCES
|
||||
unset GNUSTEP_USER_JAVA
|
||||
unset GNUSTEP_USER_DOCUMENTATION
|
||||
unset GNUSTEP_USER_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_USER_DOCUMENTATION_INFO
|
||||
|
|
|
|||
203
configure
vendored
203
configure
vendored
|
|
@ -277,7 +277,7 @@ ac_default_prefix=`if test -d C: ; then
|
|||
else
|
||||
echo /usr/GNUstep ;
|
||||
fi`
|
||||
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_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_IS_FLATTENED 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 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_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_IS_FLATTENED GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_APPS GNUSTEP_SYSTEM_LIBRARY GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES GNUSTEP_SYSTEM_DOCUMENTATION GNUSTEP_SYSTEM_DOCUMENTATION_MAN GNUSTEP_SYSTEM_DOCUMENTATION_INFO GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_LIBRARY GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES GNUSTEP_LOCAL_DOCUMENTATION GNUSTEP_LOCAL_DOCUMENTATION_MAN GNUSTEP_LOCAL_DOCUMENTATION_INFO GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_LIBRARY GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES GNUSTEP_NETWORK_DOCUMENTATION GNUSTEP_NETWORK_DOCUMENTATION_MAN GNUSTEP_NETWORK_DOCUMENTATION_INFO GNUSTEP_USER_DIR_TOOLS GNUSTEP_USER_DIR_APPS GNUSTEP_USER_DIR_LIBRARY GNUSTEP_USER_DIR_HEADERS GNUSTEP_USER_DIR_LIBRARIES GNUSTEP_USER_DIR_DOCUMENTATION GNUSTEP_USER_DIR_DOCUMENTATION_MAN GNUSTEP_USER_DIR_DOCUMENTATION_INFO 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 LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -3681,6 +3681,170 @@ else
|
|||
echo "${ECHO_T}no" >&6;
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Determine the full filesystem layout
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
#
|
||||
# TODO: Add configure flags to set these. This just sets up the
|
||||
# default GNUstep filesystem config.
|
||||
#
|
||||
|
||||
#
|
||||
# SYSTEM domain
|
||||
#
|
||||
if test x"$GNUSTEP_SYSTEM_APPS" = x""; then
|
||||
GNUSTEP_SYSTEM_APPS="$GNUSTEP_SYSTEM_ROOT/Applications"
|
||||
fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_TOOLS" = x""; then
|
||||
GNUSTEP_SYSTEM_TOOLS="$GNUSTEP_SYSTEM_ROOT/Tools"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then
|
||||
GNUSTEP_SYSTEM_LIBRARY="$GNUSTEP_SYSTEM_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_LIBRARY/Libraries/"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION="$GNUSTEP_SYSTEM_LIBRARY/Documentation"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_DOCUMENTATION_MAN" = x""; then
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION_MAN="$GNUSTEP_SYSTEM_DOCUMENTATION/man"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_DOCUMENTATION_INFO" = x""; then
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO="$GNUSTEP_SYSTEM_DOCUMENTATION/info"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test x"$GNUSTEP_LOCAL_APPS" = x""; then
|
||||
GNUSTEP_LOCAL_APPS="$GNUSTEP_LOCAL_ROOT/Applications"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_TOOLS" = x""; then
|
||||
GNUSTEP_LOCAL_TOOLS="$GNUSTEP_LOCAL_ROOT/Tools"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARY" = x""; then
|
||||
GNUSTEP_LOCAL_LIBRARY="$GNUSTEP_LOCAL_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARIES" = x""; then
|
||||
GNUSTEP_LOCAL_LIBRARIES="$GNUSTEP_LOCAL_LIBRARY/Libraries/"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_LOCAL_DOCUMENTATION="$GNUSTEP_LOCAL_LIBRARY/Documentation"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_DOCUMENTATION_MAN" = x""; then
|
||||
GNUSTEP_LOCAL_DOCUMENTATION_MAN="$GNUSTEP_LOCAL_DOCUMENTATION/man"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_DOCUMENTATION_INFO" = x""; then
|
||||
GNUSTEP_LOCAL_DOCUMENTATION_INFO="$GNUSTEP_LOCAL_DOCUMENTATION/info"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test x"$GNUSTEP_NETWORK_APPS" = x""; then
|
||||
GNUSTEP_NETWORK_APPS="$GNUSTEP_NETWORK_ROOT/Applications"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_TOOLS" = x""; then
|
||||
GNUSTEP_NETWORK_TOOLS="$GNUSTEP_NETWORK_ROOT/Tools"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARY" = x""; then
|
||||
GNUSTEP_NETWORK_LIBRARY="$GNUSTEP_NETWORK_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARIES" = x""; then
|
||||
GNUSTEP_NETWORK_LIBRARIES="$GNUSTEP_NETWORK_LIBRARY/Libraries/"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_NETWORK_DOCUMENTATION="$GNUSTEP_NETWORK_LIBRARY/Documentation"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_DOCUMENTATION_MAN" = x""; then
|
||||
GNUSTEP_NETWORK_DOCUMENTATION_MAN="$GNUSTEP_NETWORK_DOCUMENTATION/man"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_DOCUMENTATION_INFO" = x""; then
|
||||
GNUSTEP_NETWORK_DOCUMENTATION_INFO="$GNUSTEP_NETWORK_DOCUMENTATION/info"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test x"$GNUSTEP_USER_DIR_APPS" = x""; then
|
||||
GNUSTEP_USER_DIR_APPS="$GNUSTEP_USER_DIR/Applications"
|
||||
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_LIBRARY" = x""; then
|
||||
GNUSTEP_USER_DIR_LIBRARY="$GNUSTEP_USER_DIR/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers"
|
||||
else
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
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_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION="$GNUSTEP_USER_DIR/Documentation"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_DOCUMENTATION_MAN" = x""; then
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION_MAN="$GNUSTEP_USER_DIR_DOCUMENTATION/man"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_DOCUMENTATION_INFO" = x""; then
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION_INFO="$GNUSTEP_USER_DIR_DOCUMENTATION/info"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Is the system multi-platform?
|
||||
|
|
@ -4591,7 +4755,7 @@ clean_target_vendor=`$srcdir/clean_cpu.sh $target_vendor`
|
|||
#--------------------------------------------------------------------
|
||||
# Produce the output files
|
||||
#--------------------------------------------------------------------
|
||||
ac_config_files="$ac_config_files config-noarch.make config.make openapp opentool executable.template GNUmakefile GNUstep.conf GNUstep.sh GNUstep.csh fixpath.sh gnustep-make.spec gnustep-config"
|
||||
ac_config_files="$ac_config_files config-noarch.make config.make openapp opentool executable.template GNUmakefile GNUstep.conf GNUstep.sh GNUstep.csh fixpath.sh gnustep-make.spec gnustep-config filesystem.make filesystem.sh filesystem.csh"
|
||||
|
||||
ac_config_commands="$ac_config_commands default"
|
||||
|
||||
|
|
@ -5168,6 +5332,9 @@ do
|
|||
"fixpath.sh" ) CONFIG_FILES="$CONFIG_FILES fixpath.sh" ;;
|
||||
"gnustep-make.spec" ) CONFIG_FILES="$CONFIG_FILES gnustep-make.spec" ;;
|
||||
"gnustep-config" ) CONFIG_FILES="$CONFIG_FILES gnustep-config" ;;
|
||||
"filesystem.make" ) CONFIG_FILES="$CONFIG_FILES filesystem.make" ;;
|
||||
"filesystem.sh" ) CONFIG_FILES="$CONFIG_FILES filesystem.sh" ;;
|
||||
"filesystem.csh" ) CONFIG_FILES="$CONFIG_FILES filesystem.csh" ;;
|
||||
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
||||
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||||
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||||
|
|
@ -5298,6 +5465,38 @@ s,@GNUSTEP_MAKEFILES@,$GNUSTEP_MAKEFILES,;t t
|
|||
s,@HOST_INSTALL@,$HOST_INSTALL,;t t
|
||||
s,@GNUSTEP_FLATTENED@,$GNUSTEP_FLATTENED,;t t
|
||||
s,@GNUSTEP_IS_FLATTENED@,$GNUSTEP_IS_FLATTENED,;t t
|
||||
s,@GNUSTEP_SYSTEM_TOOLS@,$GNUSTEP_SYSTEM_TOOLS,;t t
|
||||
s,@GNUSTEP_SYSTEM_APPS@,$GNUSTEP_SYSTEM_APPS,;t t
|
||||
s,@GNUSTEP_SYSTEM_LIBRARY@,$GNUSTEP_SYSTEM_LIBRARY,;t t
|
||||
s,@GNUSTEP_SYSTEM_HEADERS@,$GNUSTEP_SYSTEM_HEADERS,;t t
|
||||
s,@GNUSTEP_SYSTEM_LIBRARIES@,$GNUSTEP_SYSTEM_LIBRARIES,;t t
|
||||
s,@GNUSTEP_SYSTEM_DOCUMENTATION@,$GNUSTEP_SYSTEM_DOCUMENTATION,;t t
|
||||
s,@GNUSTEP_SYSTEM_DOCUMENTATION_MAN@,$GNUSTEP_SYSTEM_DOCUMENTATION_MAN,;t t
|
||||
s,@GNUSTEP_SYSTEM_DOCUMENTATION_INFO@,$GNUSTEP_SYSTEM_DOCUMENTATION_INFO,;t t
|
||||
s,@GNUSTEP_LOCAL_TOOLS@,$GNUSTEP_LOCAL_TOOLS,;t t
|
||||
s,@GNUSTEP_LOCAL_APPS@,$GNUSTEP_LOCAL_APPS,;t t
|
||||
s,@GNUSTEP_LOCAL_LIBRARY@,$GNUSTEP_LOCAL_LIBRARY,;t t
|
||||
s,@GNUSTEP_LOCAL_HEADERS@,$GNUSTEP_LOCAL_HEADERS,;t t
|
||||
s,@GNUSTEP_LOCAL_LIBRARIES@,$GNUSTEP_LOCAL_LIBRARIES,;t t
|
||||
s,@GNUSTEP_LOCAL_DOCUMENTATION@,$GNUSTEP_LOCAL_DOCUMENTATION,;t t
|
||||
s,@GNUSTEP_LOCAL_DOCUMENTATION_MAN@,$GNUSTEP_LOCAL_DOCUMENTATION_MAN,;t t
|
||||
s,@GNUSTEP_LOCAL_DOCUMENTATION_INFO@,$GNUSTEP_LOCAL_DOCUMENTATION_INFO,;t t
|
||||
s,@GNUSTEP_NETWORK_TOOLS@,$GNUSTEP_NETWORK_TOOLS,;t t
|
||||
s,@GNUSTEP_NETWORK_APPS@,$GNUSTEP_NETWORK_APPS,;t t
|
||||
s,@GNUSTEP_NETWORK_LIBRARY@,$GNUSTEP_NETWORK_LIBRARY,;t t
|
||||
s,@GNUSTEP_NETWORK_HEADERS@,$GNUSTEP_NETWORK_HEADERS,;t t
|
||||
s,@GNUSTEP_NETWORK_LIBRARIES@,$GNUSTEP_NETWORK_LIBRARIES,;t t
|
||||
s,@GNUSTEP_NETWORK_DOCUMENTATION@,$GNUSTEP_NETWORK_DOCUMENTATION,;t t
|
||||
s,@GNUSTEP_NETWORK_DOCUMENTATION_MAN@,$GNUSTEP_NETWORK_DOCUMENTATION_MAN,;t t
|
||||
s,@GNUSTEP_NETWORK_DOCUMENTATION_INFO@,$GNUSTEP_NETWORK_DOCUMENTATION_INFO,;t t
|
||||
s,@GNUSTEP_USER_DIR_TOOLS@,$GNUSTEP_USER_DIR_TOOLS,;t t
|
||||
s,@GNUSTEP_USER_DIR_APPS@,$GNUSTEP_USER_DIR_APPS,;t t
|
||||
s,@GNUSTEP_USER_DIR_LIBRARY@,$GNUSTEP_USER_DIR_LIBRARY,;t t
|
||||
s,@GNUSTEP_USER_DIR_HEADERS@,$GNUSTEP_USER_DIR_HEADERS,;t t
|
||||
s,@GNUSTEP_USER_DIR_LIBRARIES@,$GNUSTEP_USER_DIR_LIBRARIES,;t t
|
||||
s,@GNUSTEP_USER_DIR_DOCUMENTATION@,$GNUSTEP_USER_DIR_DOCUMENTATION,;t t
|
||||
s,@GNUSTEP_USER_DIR_DOCUMENTATION_MAN@,$GNUSTEP_USER_DIR_DOCUMENTATION_MAN,;t t
|
||||
s,@GNUSTEP_USER_DIR_DOCUMENTATION_INFO@,$GNUSTEP_USER_DIR_DOCUMENTATION_INFO,;t t
|
||||
s,@GNUSTEP_MULTI_PLATFORM@,$GNUSTEP_MULTI_PLATFORM,;t t
|
||||
s,@BACKEND_BUNDLE@,$BACKEND_BUNDLE,;t t
|
||||
s,@objc_threaded@,$objc_threaded,;t t
|
||||
|
|
|
|||
166
configure.ac
166
configure.ac
|
|
@ -604,6 +604,170 @@ else
|
|||
AC_MSG_RESULT(no);
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Determine the full filesystem layout
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
#
|
||||
# TODO: Add configure flags to set these. This just sets up the
|
||||
# default GNUstep filesystem config.
|
||||
#
|
||||
|
||||
#
|
||||
# SYSTEM domain
|
||||
#
|
||||
if test x"$GNUSTEP_SYSTEM_APPS" = x""; then
|
||||
GNUSTEP_SYSTEM_APPS="$GNUSTEP_SYSTEM_ROOT/Applications"
|
||||
fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_TOOLS" = x""; then
|
||||
GNUSTEP_SYSTEM_TOOLS="$GNUSTEP_SYSTEM_ROOT/Tools"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then
|
||||
GNUSTEP_SYSTEM_LIBRARY="$GNUSTEP_SYSTEM_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_LIBRARY/Libraries/"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION="$GNUSTEP_SYSTEM_LIBRARY/Documentation"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_DOCUMENTATION_MAN" = x""; then
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION_MAN="$GNUSTEP_SYSTEM_DOCUMENTATION/man"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_DOCUMENTATION_INFO" = x""; then
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO="$GNUSTEP_SYSTEM_DOCUMENTATION/info"
|
||||
fi
|
||||
|
||||
AC_SUBST(GNUSTEP_SYSTEM_TOOLS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_APPS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_LIBRARY)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_DOCUMENTATION)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_DOCUMENTATION_MAN)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_DOCUMENTATION_INFO)
|
||||
|
||||
if test x"$GNUSTEP_LOCAL_APPS" = x""; then
|
||||
GNUSTEP_LOCAL_APPS="$GNUSTEP_LOCAL_ROOT/Applications"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_TOOLS" = x""; then
|
||||
GNUSTEP_LOCAL_TOOLS="$GNUSTEP_LOCAL_ROOT/Tools"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARY" = x""; then
|
||||
GNUSTEP_LOCAL_LIBRARY="$GNUSTEP_LOCAL_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARIES" = x""; then
|
||||
GNUSTEP_LOCAL_LIBRARIES="$GNUSTEP_LOCAL_LIBRARY/Libraries/"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_LOCAL_DOCUMENTATION="$GNUSTEP_LOCAL_LIBRARY/Documentation"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_DOCUMENTATION_MAN" = x""; then
|
||||
GNUSTEP_LOCAL_DOCUMENTATION_MAN="$GNUSTEP_LOCAL_DOCUMENTATION/man"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_DOCUMENTATION_INFO" = x""; then
|
||||
GNUSTEP_LOCAL_DOCUMENTATION_INFO="$GNUSTEP_LOCAL_DOCUMENTATION/info"
|
||||
fi
|
||||
|
||||
AC_SUBST(GNUSTEP_LOCAL_TOOLS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_APPS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_LIBRARY)
|
||||
AC_SUBST(GNUSTEP_LOCAL_HEADERS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_LIBRARIES)
|
||||
AC_SUBST(GNUSTEP_LOCAL_DOCUMENTATION)
|
||||
AC_SUBST(GNUSTEP_LOCAL_DOCUMENTATION_MAN)
|
||||
AC_SUBST(GNUSTEP_LOCAL_DOCUMENTATION_INFO)
|
||||
|
||||
if test x"$GNUSTEP_NETWORK_APPS" = x""; then
|
||||
GNUSTEP_NETWORK_APPS="$GNUSTEP_NETWORK_ROOT/Applications"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_TOOLS" = x""; then
|
||||
GNUSTEP_NETWORK_TOOLS="$GNUSTEP_NETWORK_ROOT/Tools"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARY" = x""; then
|
||||
GNUSTEP_NETWORK_LIBRARY="$GNUSTEP_NETWORK_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARIES" = x""; then
|
||||
GNUSTEP_NETWORK_LIBRARIES="$GNUSTEP_NETWORK_LIBRARY/Libraries/"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_NETWORK_DOCUMENTATION="$GNUSTEP_NETWORK_LIBRARY/Documentation"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_DOCUMENTATION_MAN" = x""; then
|
||||
GNUSTEP_NETWORK_DOCUMENTATION_MAN="$GNUSTEP_NETWORK_DOCUMENTATION/man"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_DOCUMENTATION_INFO" = x""; then
|
||||
GNUSTEP_NETWORK_DOCUMENTATION_INFO="$GNUSTEP_NETWORK_DOCUMENTATION/info"
|
||||
fi
|
||||
|
||||
AC_SUBST(GNUSTEP_NETWORK_TOOLS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_APPS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_LIBRARY)
|
||||
AC_SUBST(GNUSTEP_NETWORK_HEADERS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_LIBRARIES)
|
||||
AC_SUBST(GNUSTEP_NETWORK_DOCUMENTATION)
|
||||
AC_SUBST(GNUSTEP_NETWORK_DOCUMENTATION_MAN)
|
||||
AC_SUBST(GNUSTEP_NETWORK_DOCUMENTATION_INFO)
|
||||
|
||||
if test x"$GNUSTEP_USER_DIR_APPS" = x""; then
|
||||
GNUSTEP_USER_DIR_APPS="$GNUSTEP_USER_DIR/Applications"
|
||||
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_LIBRARY" = x""; then
|
||||
GNUSTEP_USER_DIR_LIBRARY="$GNUSTEP_USER_DIR/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers"
|
||||
else
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
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_DOCUMENTATION" = x""; then
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION="$GNUSTEP_USER_DIR/Documentation"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_DOCUMENTATION_MAN" = x""; then
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION_MAN="$GNUSTEP_USER_DIR_DOCUMENTATION/man"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_DOCUMENTATION_INFO" = x""; then
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION_INFO="$GNUSTEP_USER_DIR_DOCUMENTATION/info"
|
||||
fi
|
||||
|
||||
AC_SUBST(GNUSTEP_USER_DIR_TOOLS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_APPS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_LIBRARY)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_HEADERS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_LIBRARIES)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_DOCUMENTATION)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_DOCUMENTATION_MAN)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_DOCUMENTATION_INFO)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Is the system multi-platform?
|
||||
|
|
@ -1108,7 +1272,7 @@ AC_SUBST(target)
|
|||
#--------------------------------------------------------------------
|
||||
AC_CONFIG_FILES([config-noarch.make config.make openapp opentool
|
||||
executable.template GNUmakefile GNUstep.conf GNUstep.sh GNUstep.csh fixpath.sh
|
||||
gnustep-make.spec gnustep-config])
|
||||
gnustep-make.spec gnustep-config filesystem.make filesystem.sh filesystem.csh])
|
||||
AC_CONFIG_COMMANDS([default],
|
||||
[[chmod a+x openapp opentool fixpath.sh executable.template]],
|
||||
[[]])
|
||||
|
|
|
|||
223
filesystem.csh.in
Normal file
223
filesystem.csh.in
Normal file
|
|
@ -0,0 +1,223 @@
|
|||
#! /bin/echo This file must be sourced inside csh using: source
|
||||
#
|
||||
# @configure_input@
|
||||
#
|
||||
# Sets up the GNUstep filesystem paths for shell scripts
|
||||
#
|
||||
# Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Nicola Pero <nicola.pero@meta-innovation.com>,
|
||||
#
|
||||
# Date: February 2007
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
#
|
||||
# This does the same as filesystem.sh, but for csh.
|
||||
#
|
||||
|
||||
# We use 'set' (and not 'setenv') because we consider these temporary
|
||||
# variables that we 'unset' at the end.
|
||||
|
||||
#
|
||||
# SYSTEM domain
|
||||
#
|
||||
if ( ! ${?GNUSTEP_SYSTEM_ROOT} ) then
|
||||
set GNUSTEP_SYSTEM_APPS="@GNUSTEP_SYSTEM_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_TOOLS} ) then
|
||||
set GNUSTEP_SYSTEM_TOOLS="@GNUSTEP_SYSTEM_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_LIBRARY} ) then
|
||||
set GNUSTEP_SYSTEM_LIBRARY="@GNUSTEP_SYSTEM_LIBRARY@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_HEADERS} ) then
|
||||
set GNUSTEP_SYSTEM_HEADERS="@GNUSTEP_SYSTEM_HEADERS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_LIBRARIES} ) then
|
||||
set GNUSTEP_SYSTEM_LIBRARIES="@GNUSTEP_SYSTEM_LIBRARIES@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_DOCUMENTATION} ) then
|
||||
set GNUSTEP_SYSTEM_DOCUMENTATION="@GNUSTEP_SYSTEM_DOCUMENTATION@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_DOCUMENTATION_MAN} ) then
|
||||
set GNUSTEP_SYSTEM_DOCUMENTATION_MAN="@GNUSTEP_SYSTEM_DOCUMENTATION_MAN@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_DOCUMENTATION_INFO} ) then
|
||||
set GNUSTEP_SYSTEM_DOCUMENTATION_INFO="@GNUSTEP_SYSTEM_DOCUMENTATION_INFO@"
|
||||
endif
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
if ( ! ${?GNUSTEP_LOCAL_APPS} ) then
|
||||
set GNUSTEP_LOCAL_APPS="@GNUSTEP_LOCAL_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_TOOLS} ) then
|
||||
set GNUSTEP_LOCAL_TOOLS="@GNUSTEP_LOCAL_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_LIBRARY} ) then
|
||||
set GNUSTEP_LOCAL_LIBRARY="@GNUSTEP_LOCAL_LIBRARY@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_HEADERS} ) then
|
||||
set GNUSTEP_LOCAL_HEADERS="@GNUSTEP_LOCAL_HEADERS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_LIBRARIES} ) then
|
||||
set GNUSTEP_LOCAL_LIBRARIES="@GNUSTEP_LOCAL_LIBRARIES@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_DOCUMENTATION} ) then
|
||||
set GNUSTEP_LOCAL_DOCUMENTATION="@GNUSTEP_LOCAL_DOCUMENTATION@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_DOCUMENTATION_MAN} ) then
|
||||
set GNUSTEP_LOCAL_DOCUMENTATION_MAN="@GNUSTEP_LOCAL_DOCUMENTATION_MAN@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_DOCUMENTATION_INFO} ) then
|
||||
set GNUSTEP_LOCAL_DOCUMENTATION_INFO="@GNUSTEP_LOCAL_DOCUMENTATION_INFO@"
|
||||
endif
|
||||
|
||||
#
|
||||
# NETWORK domain
|
||||
#
|
||||
if ( ! ${?GNUSTEP_NETWORK_APPS} ) then
|
||||
set GNUSTEP_NETWORK_APPS="@GNUSTEP_NETWORK_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_TOOLS} ) then
|
||||
set GNUSTEP_NETWORK_TOOLS="@GNUSTEP_NETWORK_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_LIBRARY} ) then
|
||||
set GNUSTEP_NETWORK_LIBRARY="@GNUSTEP_NETWORK_LIBRARY@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_HEADERS} ) then
|
||||
set GNUSTEP_NETWORK_HEADERS="@GNUSTEP_NETWORK_HEADERS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_LIBRARIES} ) then
|
||||
set GNUSTEP_NETWORK_LIBRARIES="@GNUSTEP_NETWORK_LIBRARIES@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_DOCUMENTATION} ) then
|
||||
set GNUSTEP_NETWORK_DOCUMENTATION="@GNUSTEP_NETWORK_DOCUMENTATION@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_DOCUMENTATION_MAN} ) then
|
||||
set GNUSTEP_NETWORK_DOCUMENTATION_MAN="@GNUSTEP_NETWORK_DOCUMENTATION_MAN@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_DOCUMENTATION_INFO} ) then
|
||||
set GNUSTEP_NETWORK_DOCUMENTATION_INFO="@GNUSTEP_NETWORK_DOCUMENTATION_INFO@"
|
||||
endif
|
||||
|
||||
#
|
||||
# USER domain
|
||||
#
|
||||
if ( ! ${?GNUSTEP_USER_DIR_APPS} ) then
|
||||
set GNUSTEP_USER_DIR_APPS="@GNUSTEP_USER_DIR_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_TOOLS} ) then
|
||||
set GNUSTEP_USER_DIR_TOOLS="@GNUSTEP_USER_DIR_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_LIBRARY} ) then
|
||||
set GNUSTEP_USER_DIR_LIBRARY="@GNUSTEP_USER_DIR_LIBRARY@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_HEADERS} ) then
|
||||
set GNUSTEP_USER_DIR_HEADERS="@GNUSTEP_USER_DIR_HEADERS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_LIBRARIES} ) then
|
||||
set GNUSTEP_USER_DIR_LIBRARIES="@GNUSTEP_USER_DIR_LIBRARIES@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_DOCUMENTATION} ) then
|
||||
set GNUSTEP_USER_DIR_DOCUMENTATION="@GNUSTEP_USER_DIR_DOCUMENTATION@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_DOCUMENTATION_MAN} ) then
|
||||
set GNUSTEP_USER_DIR_DOCUMENTATION_MAN="@GNUSTEP_USER_DIR_DOCUMENTATION_MAN@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_DOCUMENTATION_INFO} ) then
|
||||
set GNUSTEP_USER_DIR_DOCUMENTATION_INFO="@GNUSTEP_USER_DIR_DOCUMENTATION_INFO@"
|
||||
endif
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_APPS}")
|
||||
case /*: # An absolute path
|
||||
set GNUSTEP_USER_APPS="${GNUSTEP_USER_DIR_APPS}"
|
||||
breaksw
|
||||
default: # Something else
|
||||
set GNUSTEP_USER_APPS="${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_APPS}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_TOOLS}")
|
||||
case /*:
|
||||
set GNUSTEP_USER_TOOLS="${GNUSTEP_USER_DIR_TOOLS}"
|
||||
breaksw
|
||||
default:
|
||||
set GNUSTEP_USER_TOOLS="${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_TOOLS}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_LIBRARY}")
|
||||
case /*:
|
||||
set GNUSTEP_USER_LIBRARY="${GNUSTEP_USER_DIR_LIBRARY}"
|
||||
breaksw
|
||||
default:
|
||||
set GNUSTEP_USER_LIBRARY="${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_LIBRARY}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_HEADERS}")
|
||||
case /*:
|
||||
set GNUSTEP_USER_HEADERS="${GNUSTEP_USER_DIR_HEADERS}"
|
||||
breaksw
|
||||
default:
|
||||
set GNUSTEP_USER_HEADERS="${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_HEADERS}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_LIBRARIES}")
|
||||
case /*:
|
||||
set GNUSTEP_USER_LIBRARIES="${GNUSTEP_USER_DIR_LIBRARIES}"
|
||||
breaksw
|
||||
default:
|
||||
set GNUSTEP_USER_LIBRARIES="${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_LIBRARIES}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_DOCUMENTATION}")
|
||||
case /*:
|
||||
set GNUSTEP_USER_DOCUMENTATION="${GNUSTEP_USER_DIR_DOCUMENTATION}"
|
||||
breaksw
|
||||
default:
|
||||
set GNUSTEP_USER_DOCUMENTATION="${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_DOCUMENTATION}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_DOCUMENTATION_MAN}")
|
||||
case /*:
|
||||
set GNUSTEP_USER_DOCUMENTATION_MAN="${GNUSTEP_USER_DIR_DOCUMENTATION_MAN}"
|
||||
breaksw
|
||||
default:
|
||||
set GNUSTEP_USER_DOCUMENTATION_MAN="${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_DOCUMENTATION_MAN}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_DOCUMENTATION_INFO}")
|
||||
case /*:
|
||||
set GNUSTEP_USER_DOCUMENTATION_INFO="${GNUSTEP_USER_DIR_DOCUMENTATION_INFO}"
|
||||
breaksw
|
||||
default:
|
||||
set GNUSTEP_USER_DOCUMENTATION_INFO="${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_DOCUMENTATION_INFO}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
unset GNUSTEP_USER_DIR_APPS
|
||||
unset GNUSTEP_USER_DIR_TOOLS
|
||||
unset GNUSTEP_USER_DIR_LIBRARY
|
||||
unset GNUSTEP_USER_DIR_HEADERS
|
||||
unset GNUSTEP_USER_DIR_LIBRARIES
|
||||
unset GNUSTEP_USER_DIR_DOCUMENTATION
|
||||
unset GNUSTEP_USER_DIR_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_USER_DIR_DOCUMENTATION_INFO
|
||||
158
filesystem.make
158
filesystem.make
|
|
@ -1,158 +0,0 @@
|
|||
#
|
||||
# filesystem.make
|
||||
#
|
||||
# Sets up the filesystem paths
|
||||
#
|
||||
# Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Nicola Pero <nicola.pero@meta-innovation.com>,
|
||||
# Matt Rice <ratmice@gmail.com>,
|
||||
#
|
||||
# Date: February 2007
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
#
|
||||
# We make sure that all the interesting paths in all domains are
|
||||
# defined. Having this is a great help in iterating over header dirs,
|
||||
# for example.
|
||||
#
|
||||
# PS: If you change this list, make sure that top update the list of
|
||||
# paths used in common.make when GNUSTEP_INSTALLATION_DIR is set.
|
||||
#
|
||||
|
||||
#
|
||||
# We use '?=' to only set variables that have not already been set by
|
||||
# the user in the config files (that should be read before this file).
|
||||
# So, this describes the GNUstep filesystem default that is
|
||||
# automatically used when the config file is missing some settings.
|
||||
# Some directories are fixed to be subdirectories of Library.
|
||||
#
|
||||
# We keep the list in this simple format (instead of generating it
|
||||
# from functions, for example) to make it very easy to read for
|
||||
# everyone.
|
||||
#
|
||||
|
||||
#
|
||||
# SYSTEM domain
|
||||
#
|
||||
GNUSTEP_SYSTEM_APPS ?= $(GNUSTEP_SYSTEM_ROOT)/Applications
|
||||
GNUSTEP_SYSTEM_TOOLS ?= $(GNUSTEP_SYSTEM_ROOT)/Tools
|
||||
GNUSTEP_SYSTEM_LIBRARY ?= $(GNUSTEP_SYSTEM_ROOT)/Library
|
||||
ifeq ($(GNUSTEP_IS_FLATTENED),yes)
|
||||
GNUSTEP_SYSTEM_HEADERS ?= $(GNUSTEP_SYSTEM_ROOT)/Library/Headers
|
||||
else
|
||||
GNUSTEP_SYSTEM_HEADERS ?= $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(LIBRARY_COMBO)
|
||||
endif
|
||||
GNUSTEP_SYSTEM_LIBRARIES ?= $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries
|
||||
GNUSTEP_SYSTEM_RESOURCES ?= $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Resources
|
||||
GNUSTEP_SYSTEM_JAVA ?= $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Java
|
||||
|
||||
#
|
||||
# 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_DOCUMENTATION ?= $(GNUSTEP_SYSTEM_LIBRARY)/Documentation
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION_MAN ?= $(GNUSTEP_SYSTEM_DOCUMENTATION)/man
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO ?= $(GNUSTEP_SYSTEM_DOCUMENTATION)/info
|
||||
|
||||
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
GNUSTEP_LOCAL_APPS ?= $(GNUSTEP_LOCAL_ROOT)/Applications
|
||||
GNUSTEP_LOCAL_TOOLS ?= $(GNUSTEP_LOCAL_ROOT)/Tools
|
||||
GNUSTEP_LOCAL_LIBRARY ?= $(GNUSTEP_LOCAL_ROOT)/Library
|
||||
ifeq ($(GNUSTEP_IS_FLATTENED),yes)
|
||||
GNUSTEP_LOCAL_HEADERS ?= $(GNUSTEP_LOCAL_ROOT)/Library/Headers
|
||||
else
|
||||
GNUSTEP_LOCAL_HEADERS ?= $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(LIBRARY_COMBO)
|
||||
endif
|
||||
GNUSTEP_LOCAL_LIBRARIES ?= $(GNUSTEP_LOCAL_ROOT)/Library/Libraries
|
||||
GNUSTEP_LOCAL_RESOURCES ?= $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Resources
|
||||
GNUSTEP_LOCAL_JAVA ?= $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Java
|
||||
|
||||
#
|
||||
# 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_DOCUMENTATION ?= $(GNUSTEP_LOCAL_LIBRARY)/Documentation
|
||||
GNUSTEP_LOCAL_DOCUMENTATION_MAN ?= $(GNUSTEP_LOCAL_DOCUMENTATION)/man
|
||||
GNUSTEP_LOCAL_DOCUMENTATION_INFO ?= $(GNUSTEP_LOCAL_DOCUMENTATION)/info
|
||||
|
||||
#
|
||||
# NETWORK domain
|
||||
#
|
||||
GNUSTEP_NETWORK_APPS ?= $(GNUSTEP_NETWORK_ROOT)/Applications
|
||||
GNUSTEP_NETWORK_TOOLS ?= $(GNUSTEP_NETWORK_ROOT)/Tools
|
||||
GNUSTEP_NETWORK_LIBRARY ?= $(GNUSTEP_NETWORK_ROOT)/Library
|
||||
ifeq ($(GNUSTEP_IS_FLATTENED),yes)
|
||||
GNUSTEP_NETWORK_HEADERS ?= $(GNUSTEP_NETWORK_ROOT)/Library/Headers
|
||||
else
|
||||
GNUSTEP_NETWORK_HEADERS ?= $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(LIBRARY_COMBO)
|
||||
endif
|
||||
GNUSTEP_NETWORK_LIBRARIES ?= $(GNUSTEP_NETWORK_ROOT)/Library/Libraries
|
||||
GNUSTEP_NETWORK_RESOURCES ?= $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Resources
|
||||
GNUSTEP_NETWORK_JAVA ?= $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Java
|
||||
|
||||
#
|
||||
# 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_DOCUMENTATION ?= $(GNUSTEP_NETWORK_LIBRARY)/Documentation
|
||||
GNUSTEP_NETWORK_DOCUMENTATION_MAN ?= $(GNUSTEP_NETWORK_DOCUMENTATION)/man
|
||||
GNUSTEP_NETWORK_DOCUMENTATION_INFO ?= $(GNUSTEP_NETWORK_DOCUMENTATION)/info
|
||||
|
||||
#
|
||||
# USER domain
|
||||
#
|
||||
GNUSTEP_USER_APPS ?= $(GNUSTEP_USER_ROOT)/Applications
|
||||
GNUSTEP_USER_TOOLS ?= $(GNUSTEP_USER_ROOT)/Tools
|
||||
GNUSTEP_USER_LIBRARY ?= $(GNUSTEP_USER_ROOT)/Library
|
||||
ifeq ($(GNUSTEP_IS_FLATTENED),yes)
|
||||
GNUSTEP_USER_HEADERS ?= $(GNUSTEP_USER_ROOT)/Library/Headers
|
||||
else
|
||||
GNUSTEP_USER_HEADERS ?= $(GNUSTEP_USER_ROOT)/Library/Headers/$(LIBRARY_COMBO)
|
||||
endif
|
||||
GNUSTEP_USER_LIBRARIES ?= $(GNUSTEP_USER_ROOT)/Library/Libraries
|
||||
GNUSTEP_USER_RESOURCES ?= $(GNUSTEP_USER_LIBRARY)/Libraries/Resources
|
||||
GNUSTEP_USER_JAVA ?= $(GNUSTEP_USER_LIBRARY)/Libraries/Java
|
||||
|
||||
#
|
||||
# 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_DOCUMENTATION ?= $(GNUSTEP_USER_LIBRARY)/Documentation
|
||||
GNUSTEP_USER_DOCUMENTATION_MAN ?= $(GNUSTEP_USER_DOCUMENTATION)/man
|
||||
GNUSTEP_USER_DOCUMENTATION_INFO ?= $(GNUSTEP_USER_DOCUMENTATION)/info
|
||||
198
filesystem.make.in
Normal file
198
filesystem.make.in
Normal file
|
|
@ -0,0 +1,198 @@
|
|||
#
|
||||
# filesystem.make
|
||||
#
|
||||
# Sets up the filesystem paths
|
||||
#
|
||||
# Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Nicola Pero <nicola.pero@meta-innovation.com>,
|
||||
# Matt Rice <ratmice@gmail.com>,
|
||||
#
|
||||
# Date: February 2007
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
#
|
||||
# We make sure that all the interesting paths in all domains are
|
||||
# defined. Having this is a great help in iterating over header dirs,
|
||||
# for example.
|
||||
#
|
||||
# PS: If you change this list, make sure that top update the list of
|
||||
# paths used in common.make when GNUSTEP_INSTALLATION_DIR is set.
|
||||
#
|
||||
|
||||
#
|
||||
# We use '?=' to only set variables that have not already been set by
|
||||
# the user in the config files (that should be read before this file).
|
||||
# So, this describes the GNUstep filesystem default that is
|
||||
# automatically used when the config file is missing some settings.
|
||||
#
|
||||
# Some directories are fixed to be subdirectories of Library.
|
||||
#
|
||||
# We keep the list in this simple format (instead of generating it
|
||||
# from functions, for example) to make it very easy to read for
|
||||
# everyone.
|
||||
#
|
||||
|
||||
#
|
||||
# SYSTEM domain
|
||||
#
|
||||
GNUSTEP_SYSTEM_APPS ?= @GNUSTEP_SYSTEM_APPS@
|
||||
GNUSTEP_SYSTEM_TOOLS ?= @GNUSTEP_SYSTEM_TOOLS@
|
||||
GNUSTEP_SYSTEM_LIBRARY ?= @GNUSTEP_SYSTEM_LIBRARY@
|
||||
GNUSTEP_SYSTEM_HEADERS ?= @GNUSTEP_SYSTEM_HEADERS@
|
||||
GNUSTEP_SYSTEM_LIBRARIES ?= @GNUSTEP_SYSTEM_LIBRARIES@
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION ?= @GNUSTEP_SYSTEM_DOCUMENTATION@
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION_MAN ?= @GNUSTEP_SYSTEM_DOCUMENTATION_MAN@
|
||||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO ?= @GNUSTEP_SYSTEM_DOCUMENTATION_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
|
||||
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
GNUSTEP_LOCAL_APPS ?= @GNUSTEP_LOCAL_APPS@
|
||||
GNUSTEP_LOCAL_TOOLS ?= @GNUSTEP_LOCAL_TOOLS@
|
||||
GNUSTEP_LOCAL_LIBRARY ?= @GNUSTEP_LOCAL_LIBRARY@
|
||||
GNUSTEP_LOCAL_HEADERS ?= @GNUSTEP_LOCAL_HEADERS@
|
||||
GNUSTEP_LOCAL_LIBRARIES ?= @GNUSTEP_LOCAL_LIBRARIES@
|
||||
GNUSTEP_LOCAL_DOCUMENTATION ?= @GNUSTEP_LOCAL_DOCUMENTATION@
|
||||
GNUSTEP_LOCAL_DOCUMENTATION_MAN ?= @GNUSTEP_LOCAL_DOCUMENTATION_MAN@
|
||||
GNUSTEP_LOCAL_DOCUMENTATION_INFO ?= @GNUSTEP_LOCAL_DOCUMENTATION_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
|
||||
|
||||
|
||||
|
||||
#
|
||||
# NETWORK domain
|
||||
#
|
||||
GNUSTEP_NETWORK_APPS ?= @GNUSTEP_NETWORK_APPS@
|
||||
GNUSTEP_NETWORK_TOOLS ?= @GNUSTEP_NETWORK_TOOLS@
|
||||
GNUSTEP_NETWORK_LIBRARY ?= @GNUSTEP_NETWORK_LIBRARY@
|
||||
GNUSTEP_NETWORK_HEADERS ?= @GNUSTEP_NETWORK_HEADERS@
|
||||
GNUSTEP_NETWORK_LIBRARIES ?= @GNUSTEP_NETWORK_LIBRARIES@
|
||||
GNUSTEP_NETWORK_DOCUMENTATION ?= @GNUSTEP_NETWORK_DOCUMENTATION@
|
||||
GNUSTEP_NETWORK_DOCUMENTATION_MAN ?= @GNUSTEP_NETWORK_DOCUMENTATION_MAN@
|
||||
GNUSTEP_NETWORK_DOCUMENTATION_INFO ?= @GNUSTEP_NETWORK_DOCUMENTATION_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
|
||||
|
||||
|
||||
#
|
||||
# USER domain
|
||||
# Please note that here the GNUstep.conf values are called GNUSTEP_USER_DIR_*
|
||||
# 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_TOOLS ?= @GNUSTEP_USER_DIR_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_DOCUMENTATION ?= @GNUSTEP_USER_DIR_DOCUMENTATION@
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION_MAN ?= @GNUSTEP_USER_DIR_DOCUMENTATION_MAN@
|
||||
GNUSTEP_USER_DIR_DOCUMENTATION_INFO ?= @GNUSTEP_USER_DIR_DOCUMENTATION_INFO@
|
||||
|
||||
# Now, any directories in the user domain that are relative (ie, they
|
||||
# don't start with '/') get automatically prefixed with GNUSTEP_HOME.
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_APPS)),)
|
||||
# Path starts with '/', so we can use it as it is
|
||||
GNUSTEP_USER_APPS = $(GNUSTEP_USER_DIR_APPS)
|
||||
else
|
||||
# Path does no start with '/', consider it as relative to GNUSTEP_HOME
|
||||
GNUSTEP_USER_APPS = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_APPS)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_TOOLS)),)
|
||||
GNUSTEP_USER_TOOLS = $(GNUSTEP_USER_DIR_TOOLS)
|
||||
else
|
||||
GNUSTEP_USER_TOOLS = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_TOOLS)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_LIBRARY)),)
|
||||
GNUSTEP_USER_LIBRARY = $(GNUSTEP_USER_DIR_LIBRARY)
|
||||
else
|
||||
GNUSTEP_USER_LIBRARY = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_LIBRARY)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_HEADERS)),)
|
||||
GNUSTEP_USER_HEADERS = $(GNUSTEP_USER_DIR_HEADERS)
|
||||
else
|
||||
GNUSTEP_USER_HEADERS = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_HEADERS)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_LIBRARIES)),)
|
||||
GNUSTEP_USER_LIBRARIES = $(GNUSTEP_USER_DIR_LIBRARIES)
|
||||
else
|
||||
GNUSTEP_USER_LIBRARIES = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_LIBRARIES)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_DOCUMENTATION)),)
|
||||
GNUSTEP_USER_DOCUMENTATION = $(GNUSTEP_USER_DIR_DOCUMENTATION)
|
||||
else
|
||||
GNUSTEP_USER_DOCUMENTATION = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_DOCUMENTATION)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_DOCUMENTATION_MAN)),)
|
||||
GNUSTEP_USER_DOCUMENTATION_MAN = $(GNUSTEP_USER_DIR_DOCUMENTATION_MAN)
|
||||
else
|
||||
GNUSTEP_USER_DOCUMENTATION_MAN = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_DOCUMENTATION_MAN)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_DOCUMENTATION_INFO)),)
|
||||
GNUSTEP_USER_DOCUMENTATION_INFO = $(GNUSTEP_USER_DIR_DOCUMENTATION_INFO)
|
||||
else
|
||||
GNUSTEP_USER_DOCUMENTATION_INFO = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_DOCUMENTATION_INFO)
|
||||
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
|
||||
115
filesystem.sh
115
filesystem.sh
|
|
@ -1,115 +0,0 @@
|
|||
#! /bin/echo This file must be sourced inside (ba)sh using: .
|
||||
# filesystem.sh
|
||||
#
|
||||
# Sets up the GNUstep filesystem paths for shell scripts
|
||||
#
|
||||
# Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Nicola Pero <nicola.pero@meta-innovation.com>,
|
||||
#
|
||||
# Date: February 2007
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
#
|
||||
# This does the same that filesystem.make does, but for GNUstep.sh.
|
||||
# Include this file after reading your config to make sure that all
|
||||
# the paths are available.
|
||||
#
|
||||
# PS: If you change this list, make sure that top update the list of
|
||||
# paths used in all other filesystem.*, and in common.make when
|
||||
# GNUSTEP_INSTALLATION_DIR is set.
|
||||
#
|
||||
|
||||
# PS: We don't want to define these variables to avoid extreme
|
||||
# environment pollution. :-) They are fixed subdirs of LIBRARY if you
|
||||
# need them.
|
||||
#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
|
||||
|
||||
#
|
||||
# SYSTEM domain
|
||||
#
|
||||
if [ -z "$GNUSTEP_SYSTEM_APPS" ]; then GNUSTEP_SYSTEM_APPS="$GNUSTEP_SYSTEM_ROOT/Applications"; fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_TOOLS" ]; then GNUSTEP_SYSTEM_TOOLS="$GNUSTEP_SYSTEM_ROOT/Tools"; fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_LIBRARY" ]; then GNUSTEP_SYSTEM_LIBRARY="$GNUSTEP_SYSTEM_ROOT/Library"; fi
|
||||
if [ "$GNUSTEP_IS_FLATTENED" = "yes" ]; then
|
||||
if [ -z "$GNUSTEP_SYSTEM_HEADERS" ]; then GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"; fi
|
||||
else
|
||||
if [ -z "$GNUSTEP_SYSTEM_HEADERS" ]; then GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"; fi
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_LIBRARIES" ]; then GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_LIBRARY/Libraries/"; fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_RESOURCES" ]; then GNUSTEP_SYSTEM_RESOURCES="$GNUSTEP_SYSTEM_LIBRARY/Libraries/Resources"; fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_JAVA" ]; then GNUSTEP_SYSTEM_JAVA="$GNUSTEP_SYSTEM_LIBRARY/Libraries/Java"; fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_DOCUMENTATION" ]; then GNUSTEP_SYSTEM_DOCUMENTATION="$GNUSTEP_SYSTEM_LIBRARY/Documentation"; fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_DOCUMENTATION_MAN" ]; then GNUSTEP_SYSTEM_DOCUMENTATION_MAN="$GNUSTEP_SYSTEM_DOCUMENTATION/man"; fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_DOCUMENTATION_INFO" ]; then GNUSTEP_SYSTEM_DOCUMENTATION_INFO="$GNUSTEP_SYSTEM_DOCUMENTATION/info"; fi
|
||||
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
if [ -z "$GNUSTEP_LOCAL_APPS" ]; then GNUSTEP_LOCAL_APPS="$GNUSTEP_LOCAL_ROOT/Applications"; fi
|
||||
if [ -z "$GNUSTEP_LOCAL_TOOLS" ]; then GNUSTEP_LOCAL_TOOLS="$GNUSTEP_LOCAL_ROOT/Tools"; fi
|
||||
if [ -z "$GNUSTEP_LOCAL_LIBRARY" ]; then GNUSTEP_LOCAL_LIBRARY="$GNUSTEP_LOCAL_ROOT/Library"; fi
|
||||
if [ "$GNUSTEP_IS_FLATTENED" = "yes" ]; then
|
||||
if [ -z "$GNUSTEP_LOCAL_HEADERS" ]; then GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers"; fi
|
||||
else
|
||||
if [ -z "$GNUSTEP_LOCAL_HEADERS" ]; then GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers/$LIBRARY_COMBO"; fi
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_LIBRARIES" ]; then GNUSTEP_LOCAL_LIBRARIES="$GNUSTEP_LOCAL_LIBRARY/Libraries/"; fi
|
||||
if [ -z "$GNUSTEP_LOCAL_RESOURCES" ]; then GNUSTEP_LOCAL_RESOURCES="$GNUSTEP_LOCAL_LIBRARY/Libraries/Resources"; fi
|
||||
if [ -z "$GNUSTEP_LOCAL_JAVA" ]; then GNUSTEP_LOCAL_JAVA="$GNUSTEP_LOCAL_LIBRARY/Libraries/Java"; fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOCUMENTATION" ]; then GNUSTEP_LOCAL_DOCUMENTATION="$GNUSTEP_LOCAL_LIBRARY/Documentation"; fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOCUMENTATION_MAN" ]; then GNUSTEP_LOCAL_DOCUMENTATION_MAN="$GNUSTEP_LOCAL_DOCUMENTATION/man"; fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOCUMENTATION_INFO" ]; then GNUSTEP_LOCAL_DOCUMENTATION_INFO="$GNUSTEP_LOCAL_DOCUMENTATION/info"; fi
|
||||
|
||||
#
|
||||
# NETWORK domain
|
||||
#
|
||||
if [ -z "$GNUSTEP_NETWORK_APPS" ]; then GNUSTEP_NETWORK_APPS="$GNUSTEP_NETWORK_ROOT/Applications"; fi
|
||||
if [ -z "$GNUSTEP_NETWORK_TOOLS" ]; then GNUSTEP_NETWORK_TOOLS="$GNUSTEP_NETWORK_ROOT/Tools"; fi
|
||||
if [ -z "$GNUSTEP_NETWORK_LIBRARY" ]; then GNUSTEP_NETWORK_LIBRARY="$GNUSTEP_NETWORK_ROOT/Library"; fi
|
||||
if [ "$GNUSTEP_IS_FLATTENED" = "yes" ]; then
|
||||
if [ -z "$GNUSTEP_NETWORK_HEADERS" ]; then GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers"; fi
|
||||
else
|
||||
if [ -z "$GNUSTEP_NETWORK_HEADERS" ]; then GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers/$LIBRARY_COMBO"; fi
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_LIBRARIES" ]; then GNUSTEP_NETWORK_LIBRARIES="$GNUSTEP_NETWORK_LIBRARY/Libraries/"; fi
|
||||
if [ -z "$GNUSTEP_NETWORK_RESOURCES" ]; then GNUSTEP_NETWORK_RESOURCES="$GNUSTEP_NETWORK_LIBRARY/Libraries/Resources"; fi
|
||||
if [ -z "$GNUSTEP_NETWORK_JAVA" ]; then GNUSTEP_NETWORK_JAVA="$GNUSTEP_NETWORK_LIBRARY/Libraries/Java"; fi
|
||||
if [ -z "$GNUSTEP_NETWORK_DOCUMENTATION" ]; then GNUSTEP_NETWORK_DOCUMENTATION="$GNUSTEP_NETWORK_LIBRARY/Documentation"; fi
|
||||
if [ -z "$GNUSTEP_NETWORK_DOCUMENTATION_MAN" ]; then GNUSTEP_NETWORK_DOCUMENTATION_MAN="$GNUSTEP_NETWORK_DOCUMENTATION/man"; fi
|
||||
if [ -z "$GNUSTEP_NETWORK_DOCUMENTATION_INFO" ]; then GNUSTEP_NETWORK_DOCUMENTATION_INFO="$GNUSTEP_NETWORK_DOCUMENTATION/info"; fi
|
||||
|
||||
|
||||
#
|
||||
# USER domain
|
||||
#
|
||||
if [ -z "$GNUSTEP_USER_APPS" ]; then GNUSTEP_USER_APPS="$GNUSTEP_USER_ROOT/Applications"; fi
|
||||
if [ -z "$GNUSTEP_USER_TOOLS" ]; then GNUSTEP_USER_TOOLS="$GNUSTEP_USER_ROOT/Tools"; fi
|
||||
if [ -z "$GNUSTEP_USER_LIBRARY" ]; then GNUSTEP_USER_LIBRARY="$GNUSTEP_USER_ROOT/Library"; fi
|
||||
if [ "$GNUSTEP_IS_FLATTENED" = "yes" ]; then
|
||||
if [ -z "$GNUSTEP_USER_HEADERS" ]; then GNUSTEP_USER_HEADERS="$GNUSTEP_USER_ROOT/Library/Headers"; fi
|
||||
else
|
||||
if [ -z "$GNUSTEP_USER_HEADERS" ]; then GNUSTEP_USER_HEADERS="$GNUSTEP_USER_ROOT/Library/Headers/$LIBRARY_COMBO"; fi
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_LIBRARIES" ]; then GNUSTEP_USER_LIBRARIES="$GNUSTEP_USER_LIBRARY/Libraries/"; fi
|
||||
if [ -z "$GNUSTEP_USER_RESOURCES" ]; then GNUSTEP_USER_RESOURCES="$GNUSTEP_USER_LIBRARY/Libraries/Resources"; fi
|
||||
if [ -z "$GNUSTEP_USER_JAVA" ]; then GNUSTEP_USER_JAVA="$GNUSTEP_USER_LIBRARY/Libraries/Java"; fi
|
||||
if [ -z "$GNUSTEP_USER_DOCUMENTATION" ]; then GNUSTEP_USER_DOCUMENTATION="$GNUSTEP_USER_LIBRARY/Documentation"; fi
|
||||
if [ -z "$GNUSTEP_USER_DOCUMENTATION_MAN" ]; then GNUSTEP_USER_DOCUMENTATION_MAN="$GNUSTEP_USER_DOCUMENTATION/man"; fi
|
||||
if [ -z "$GNUSTEP_USER_DOCUMENTATION_INFO" ]; then GNUSTEP_USER_DOCUMENTATION_INFO="$GNUSTEP_USER_DOCUMENTATION/info"; fi
|
||||
203
filesystem.sh.in
Normal file
203
filesystem.sh.in
Normal file
|
|
@ -0,0 +1,203 @@
|
|||
#! /bin/echo This file must be sourced inside (ba)sh using: .
|
||||
#
|
||||
# @configure_input@
|
||||
#
|
||||
# Sets up the GNUstep filesystem paths for shell scripts
|
||||
#
|
||||
# Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Nicola Pero <nicola.pero@meta-innovation.com>,
|
||||
#
|
||||
# Date: February 2007
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
#
|
||||
# This does the same that filesystem.make does, but for GNUstep.sh.
|
||||
# Include this file after reading your config to make sure that all
|
||||
# the paths are available.
|
||||
#
|
||||
# PS: If you change this list, make sure that top update the list of
|
||||
# paths used in all other filesystem.*, and in common.make when
|
||||
# GNUSTEP_INSTALLATION_DIR is set.
|
||||
#
|
||||
|
||||
# PS: We don't want to define these variables to avoid extreme
|
||||
# environment pollution. :-) They are fixed subdirs of LIBRARY if you
|
||||
# need them.
|
||||
#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
|
||||
|
||||
#
|
||||
# SYSTEM domain
|
||||
#
|
||||
if [ -z "$GNUSTEP_SYSTEM_APPS" ];
|
||||
then GNUSTEP_SYSTEM_APPS="@GNUSTEP_SYSTEM_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_TOOLS" ];
|
||||
then GNUSTEP_SYSTEM_TOOLS="@GNUSTEP_SYSTEM_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_LIBRARY" ];
|
||||
then GNUSTEP_SYSTEM_LIBRARY="@GNUSTEP_SYSTEM_LIBRARY@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_HEADERS" ];
|
||||
then GNUSTEP_SYSTEM_HEADERS="@GNUSTEP_SYSTEM_HEADERS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_LIBRARIES" ];
|
||||
then GNUSTEP_SYSTEM_LIBRARIES="@GNUSTEP_SYSTEM_LIBRARIES@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_DOCUMENTATION" ];
|
||||
then GNUSTEP_SYSTEM_DOCUMENTATION="@GNUSTEP_SYSTEM_DOCUMENTATION@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_DOCUMENTATION_MAN" ];
|
||||
then GNUSTEP_SYSTEM_DOCUMENTATION_MAN="@GNUSTEP_SYSTEM_DOCUMENTATION_MAN@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_DOCUMENTATION_INFO" ];
|
||||
then GNUSTEP_SYSTEM_DOCUMENTATION_INFO="@GNUSTEP_SYSTEM_DOCUMENTATION_INFO@"
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
if [ -z "$GNUSTEP_LOCAL_APPS" ];
|
||||
then GNUSTEP_LOCAL_APPS="@GNUSTEP_LOCAL_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_TOOLS" ];
|
||||
then GNUSTEP_LOCAL_TOOLS="@GNUSTEP_LOCAL_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_LIBRARY" ];
|
||||
then GNUSTEP_LOCAL_LIBRARY="@GNUSTEP_LOCAL_LIBRARY@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_HEADERS" ];
|
||||
then GNUSTEP_LOCAL_HEADERS="@GNUSTEP_LOCAL_HEADERS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_LIBRARIES" ];
|
||||
then GNUSTEP_LOCAL_LIBRARIES="@GNUSTEP_LOCAL_LIBRARIES@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOCUMENTATION" ];
|
||||
then GNUSTEP_LOCAL_DOCUMENTATION="@GNUSTEP_LOCAL_DOCUMENTATION@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOCUMENTATION_MAN" ];
|
||||
then GNUSTEP_LOCAL_DOCUMENTATION_MAN="@GNUSTEP_LOCAL_DOCUMENTATION_MAN@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOCUMENTATION_INFO" ];
|
||||
then GNUSTEP_LOCAL_DOCUMENTATION_INFO="@GNUSTEP_LOCAL_DOCUMENTATION_INFO@"
|
||||
fi
|
||||
|
||||
#
|
||||
# NETWORK domain
|
||||
#
|
||||
if [ -z "$GNUSTEP_NETWORK_APPS" ];
|
||||
then GNUSTEP_NETWORK_APPS="@GNUSTEP_NETWORK_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_TOOLS" ];
|
||||
then GNUSTEP_NETWORK_TOOLS="@GNUSTEP_NETWORK_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_LIBRARY" ];
|
||||
then GNUSTEP_NETWORK_LIBRARY="@GNUSTEP_NETWORK_LIBRARY@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_HEADERS" ];
|
||||
then GNUSTEP_NETWORK_HEADERS="@GNUSTEP_NETWORK_HEADERS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_LIBRARIES" ];
|
||||
then GNUSTEP_NETWORK_LIBRARIES="@GNUSTEP_NETWORK_LIBRARIES@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_DOCUMENTATION" ];
|
||||
then GNUSTEP_NETWORK_DOCUMENTATION="@GNUSTEP_NETWORK_DOCUMENTATION@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_DOCUMENTATION_MAN" ];
|
||||
then GNUSTEP_NETWORK_DOCUMENTATION_MAN="@GNUSTEP_NETWORK_DOCUMENTATION_MAN@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_DOCUMENTATION_INFO" ];
|
||||
then GNUSTEP_NETWORK_DOCUMENTATION_INFO="@GNUSTEP_NETWORK_DOCUMENTATION_INFO@"
|
||||
fi
|
||||
|
||||
#
|
||||
# USER domain
|
||||
#
|
||||
if [ -z "$GNUSTEP_USER_DIR_APPS" ];
|
||||
then GNUSTEP_USER_DIR_APPS="@GNUSTEP_USER_DIR_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_TOOLS" ];
|
||||
then GNUSTEP_USER_DIR_TOOLS="@GNUSTEP_USER_DIR_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_LIBRARY" ];
|
||||
then GNUSTEP_USER_DIR_LIBRARY="@GNUSTEP_USER_DIR_LIBRARY@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_HEADERS" ];
|
||||
then GNUSTEP_USER_DIR_HEADERS="@GNUSTEP_USER_DIR_HEADERS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_LIBRARIES" ];
|
||||
then GNUSTEP_USER_DIR_LIBRARIES="@GNUSTEP_USER_DIR_LIBRARIES@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_DOCUMENTATION" ];
|
||||
then GNUSTEP_USER_DIR_DOCUMENTATION="@GNUSTEP_USER_DIR_DOCUMENTATION@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_DOCUMENTATION_MAN" ];
|
||||
then GNUSTEP_USER_DIR_DOCUMENTATION_MAN="@GNUSTEP_USER_DIR_DOCUMENTATION_MAN@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_DOCUMENTATION_INFO" ];
|
||||
then GNUSTEP_USER_DIR_DOCUMENTATION_INFO="@GNUSTEP_USER_DIR_DOCUMENTATION_INFO@"
|
||||
fi
|
||||
|
||||
#
|
||||
# Now for all directories in the USER domain, check if they are
|
||||
# relative; if so, consider them as subdirs of GNUSTEP_HOME.
|
||||
#
|
||||
case "$GNUSTEP_USER_DIR_APPS" in
|
||||
/*) # An absolute path
|
||||
GNUSTEP_USER_APPS="$GNUSTEP_USER_DIR_APPS";;
|
||||
*) # Something else
|
||||
GNUSTEP_USER_APPS="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_APPS";;
|
||||
esac
|
||||
|
||||
case "$GNUSTEP_USER_DIR_TOOLS" in
|
||||
/*) GNUSTEP_USER_TOOLS="$GNUSTEP_USER_DIR_TOOLS";;
|
||||
*) GNUSTEP_USER_TOOLS="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_TOOLS";;
|
||||
esac
|
||||
|
||||
case "$GNUSTEP_USER_DIR_LIBRARY" in
|
||||
/*) GNUSTEP_USER_LIBRARY="$GNUSTEP_USER_DIR_LIBRARY";;
|
||||
*) GNUSTEP_USER_LIBRARY="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_LIBRARY";;
|
||||
esac
|
||||
|
||||
case "$GNUSTEP_USER_DIR_HEADERS" in
|
||||
/*) GNUSTEP_USER_HEADERS="$GNUSTEP_USER_DIR_HEADERS";;
|
||||
*) GNUSTEP_USER_HEADERS="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_HEADERS";;
|
||||
esac
|
||||
|
||||
case "$GNUSTEP_USER_DIR_LIBRARIES" in
|
||||
/*) GNUSTEP_USER_LIBRARIES="$GNUSTEP_USER_DIR_LIBRARIES";;
|
||||
*) GNUSTEP_USER_LIBRARIES="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_LIBRARIES";;
|
||||
esac
|
||||
|
||||
case "$GNUSTEP_USER_DIR_DOCUMENTATION" in
|
||||
/*) GNUSTEP_USER_DOCUMENTATION="$GNUSTEP_USER_DIR_DOCUMENTATION";;
|
||||
*) GNUSTEP_USER_DOCUMENTATION="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_DOCUMENTATION";;
|
||||
esac
|
||||
|
||||
case "$GNUSTEP_USER_DIR_DOCUMENTATION_MAN" in
|
||||
/*) GNUSTEP_USER_DOCUMENTATION_MAN="$GNUSTEP_USER_DIR_DOCUMENTATION_MAN";;
|
||||
*) GNUSTEP_USER_DOCUMENTATION_MAN="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_DOCUMENTATION_MAN";;
|
||||
esac
|
||||
|
||||
case "$GNUSTEP_USER_DIR_DOCUMENTATION_INFO" in
|
||||
/*) GNUSTEP_USER_DOCUMENTATION_INFO="$GNUSTEP_USER_DIR_DOCUMENTATION_INFO";;
|
||||
*) GNUSTEP_USER_DOCUMENTATION_INFO="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_DOCUMENTATION_INFO";;
|
||||
esac
|
||||
Loading…
Reference in a new issue