Added new variables to GNUstep.conf

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24533 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-02-14 03:13:38 +00:00
parent d656596e1d
commit 60d2f74200
3 changed files with 109 additions and 5 deletions

View file

@ -1,3 +1,12 @@
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
* GNUmakefile.in (distclean): Remove GNUstep.conf.
Do not remove GNUsteprc.
(generated-files): Added GNUstep.conf.
(GNUstep.conf): New rule to regenerate it.
* GNUstep.conf.in: Added all the new filesystem options with
explanations on what they mean.
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
Warning: the software will be instable for some time. Don't

View file

@ -254,7 +254,7 @@ distclean: clean
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 gnustep-make.spec GNUstep.conf
rm -f config-precomp-test.log
svn-tag:
@ -317,7 +317,7 @@ rpm: test-RPM_TOPDIR dist
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
filesystem.make filesystem.sh filesystem.csh GNUstep.conf
GNUmakefile: GNUmakefile.in config.status
$(SHELL) config.status
@ -328,6 +328,9 @@ GNUstep.sh: GNUstep.sh.in
GNUstep.csh: GNUstep.csh.in
$(SHELL) config.status
GNUstep.conf: GNUstep.conf.in
$(SHELL) config.status
fixpath.sh: fixpath.sh.in
$(SHELL) config.status

View file

@ -1,6 +1,4 @@
##
## This is the GNUstep configuration file.
##
## Any line starting with a '#' is a comment.
## Empty lines are ignored.
@ -12,12 +10,106 @@
##
## Standard sh quotes can be used in YYY but only at runtime; they can
## not be used while building.
##
## GNUstep can use up to 4 domains at the same time. They are System,
## Local, Network and User. You can install your programs / resources
## in any of these domains. This file mostly deals with configuring
## how the domains map to your filesystem.
## IMPORTANT: Don't delete lines from this file unless you want
## the values hardcoded in the packages to be used. If you want
## to suppress the local domain, set all its paths to be the same
## as the system domain. If you want to suppress the network domain,
## set all its paths to be the same as the local domain. If you
## want to suppress the user domain, set its paths to be the same
## as the network domain. You can not suppress the system domain.
## These GNUSTEP_*_ROOT variables are obsolete, and will be removed.
GNUSTEP_SYSTEM_ROOT=@GNUSTEP_SYSTEM_ROOT@
GNUSTEP_LOCAL_ROOT=@GNUSTEP_LOCAL_ROOT@
GNUSTEP_NETWORK_ROOT=@GNUSTEP_NETWORK_ROOT@
## The name of the user config file. This file can override
## some settings in this file. Usually used by users that want
## to install things into their GNUstep user domain and/or have
## many such domains.
GNUSTEP_USER_CONFIG_FILE=@GNUSTEP_USER_CONFIG_FILE@
## The name of the user directory, if any. This is obsolete,
## and will be removed.
GNUSTEP_USER_DIR=@GNUSTEP_USER_DIR@
## The name of the user directory where defaults (eg, preferences) are
## stored. If it does not start with a '/', it will be considered
## relative to the user home directory.
GNUSTEP_USER_DEFAULTS_DIR=@GNUSTEP_USER_DEFAULTS_DIR@
## This is where System GUI Applications get installed.
## Traditionally it is /usr/GNUstep/System/Apps.
GNUSTEP_SYSTEM_APPS=@GNUSTEP_SYSTEM_APPS@
## This is where System Command-Line Tools get installed.
## Traditionally it is /usr/GNUstep/System/Tools.
GNUSTEP_SYSTEM_TOOLS=@GNUSTEP_SYSTEM_TOOLS@
## This is where System resources get installed. This directory will
## contain a lot of executable code since *step traditionally likes to
## bundle executables and resources together.
## Traditionally it is /usr/GNUstep/System/Library.
GNUSTEP_SYSTEM_LIBRARY=@GNUSTEP_SYSTEM_LIBRARY@
## This is where System headers get installed. They are the
## library .h headers.
## Traditionally it is /usr/GNUstep/System/Library/Libraries/Headers.
GNUSTEP_SYSTEM_HEADERS=@GNUSTEP_SYSTEM_HEADERS@
## This is where System libraries get installed. By libraries we mean
## the shared/static object files that you can link into programs.
## Traditionally it is /usr/GNUstep/System/Library/Libraries/
GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@
## This is where System documentation get installed. This is known
## not to contain any executable, so we keep it separate.
## Traditionally it is /usr/GNUstep/System/Library/Documentation/
GNUSTEP_SYSTEM_DOCUMENTATION=@GNUSTEP_SYSTEM_DOCUMENTATION@
## This is where System man pages get installed.
## Traditionally it is /usr/GNUstep/System/Library/Documentation/man/
GNUSTEP_SYSTEM_DOCUMENTATION_MAN=@GNUSTEP_SYSTEM_DOCUMENTATION_MAN@
## This is where System info pages get installed.
## Traditionally it is /usr/GNUstep/System/Library/Documentation/info/
GNUSTEP_SYSTEM_DOCUMENTATION_INFO=@GNUSTEP_SYSTEM_DOCUMENTATION_INFO@
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@
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@
# Important: settings in the User should normally be relative paths,
# and will be interpreted as relative to the user's directory. This
# allows each user to have their own domain to install things. You
# can set them to be absolute, mostly if you want to disable them
# by setting them equal to the ones in the Network domain.
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@