mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Updated default location of configuration file
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32571 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
4e1225d78e
commit
b7179b739f
5 changed files with 84 additions and 5 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2011-03-14 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac (--with-config-file): If nothing is specified, use
|
||||
/etc/GNUstep/GNUstep.conf if the prefix is /, /usr or
|
||||
/usr/GNUstep, and $prefix/etc/GNUstep/GNUstep.conf in other cases.
|
||||
Updated documentation.
|
||||
* configure: Regenerated.
|
||||
* Documentations/releasenotes.texi: Explain the change in default
|
||||
location of the config file.
|
||||
* RELEASENOTES: Regenerated.
|
||||
|
||||
2011-03-14 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* GNUmakefile.in (install): Fixed installing
|
||||
|
|
|
|||
|
|
@ -33,6 +33,30 @@ to
|
|||
. /usr/local/share/GNUstep/Makefiles/GNUstep.sh
|
||||
@end smallexample
|
||||
|
||||
@item The default location of the configuration file changed
|
||||
Before version 2.6.0, the configuration file was always by default
|
||||
/etc/GNUstep/GNUstep.conf no matter what filesystem layout and prefix
|
||||
were used. Starting with version 2.6.0, that is the default location
|
||||
of the configuration file only when installing system-wide, that is
|
||||
with a prefix set to /, /usr or /usr/GNUstep. In all other cases, the
|
||||
configuration file is by default located in
|
||||
$prefix/etc/GNUstep/GNUstep.conf.
|
||||
|
||||
In particular, this means that if ./configure is invoked with no
|
||||
options specified, the default location of the configuration file is
|
||||
now /usr/local/etc/GNUstep/GNUstep.conf (and no longer
|
||||
/etc/GNUstep/GNUstep.conf).
|
||||
|
||||
Please note that the --with-config-file=xxx option allow you to
|
||||
specify whatever location for the configuration file that you want;
|
||||
the default is only used if no such option is specified and
|
||||
gnustep-make has to pick a reasonable default location for the
|
||||
configuration file.
|
||||
|
||||
Finally, also note that the default location of the configuration file
|
||||
on Darwin has not changed and is still /Library/GNUstep/GNUstep.conf
|
||||
regardless of the prefix selected.
|
||||
|
||||
@end table
|
||||
|
||||
@section Version 2.4.0
|
||||
|
|
|
|||
24
RELEASENOTES
24
RELEASENOTES
|
|
@ -31,6 +31,30 @@ using a newer version of the make system.
|
|||
|
||||
. /usr/local/share/GNUstep/Makefiles/GNUstep.sh
|
||||
|
||||
`The default location of the configuration file changed'
|
||||
Before version 2.6.0, the configuration file was always by default
|
||||
/etc/GNUstep/GNUstep.conf no matter what filesystem layout and
|
||||
prefix were used. Starting with version 2.6.0, that is the
|
||||
default location of the configuration file only when installing
|
||||
system-wide, that is with a prefix set to /, /usr or /usr/GNUstep.
|
||||
In all other cases, the configuration file is by default located
|
||||
in $prefix/etc/GNUstep/GNUstep.conf.
|
||||
|
||||
In particular, this means that if ./configure is invoked with no
|
||||
options specified, the default location of the configuration file
|
||||
is now /usr/local/etc/GNUstep/GNUstep.conf (and no longer
|
||||
/etc/GNUstep/GNUstep.conf).
|
||||
|
||||
Please note that the -with-config-file=xxx option allow you to
|
||||
specify whatever location for the configuration file that you want;
|
||||
the default is only used if no such option is specified and
|
||||
gnustep-make has to pick a reasonable default location for the
|
||||
configuration file.
|
||||
|
||||
Finally, also note that the default location of the configuration
|
||||
file on Darwin has not changed and is still
|
||||
/Library/GNUstep/GNUstep.conf regardless of the prefix selected.
|
||||
|
||||
|
||||
1.2 Version 2.4.0
|
||||
=================
|
||||
|
|
|
|||
14
configure
vendored
14
configure
vendored
|
|
@ -1003,8 +1003,13 @@ Optional Packages:
|
|||
|
||||
--with-config-file=PATH
|
||||
Set the path of the system GNUstep config file. Use this option
|
||||
if you want to have the GNUstep config file in a non-standard place.
|
||||
if you want to have the GNUstep config file in a non-standard
|
||||
place.
|
||||
Example: --with-config-file=/usr/GNUstep/GNUstep.conf
|
||||
By default, if this option is not specified, the config file is
|
||||
/etc/GNUstep/GNUstep.conf if the prefix is /, /usr or /usr/GNUstep
|
||||
and $prefix/etc/GNUstep/GNUstep.conf otherwise. On Apple, it is
|
||||
always /Library/GNUstep/GNUstep.conf regardless of prefix.
|
||||
|
||||
|
||||
--with-system-root
|
||||
|
|
@ -4060,7 +4065,12 @@ fi;
|
|||
if test "$GNUSTEP_CONFIG_FILE" = "" -o "$GNUSTEP_CONFIG_FILE" = "no"; then
|
||||
case "$target_os" in
|
||||
darwin*) GNUSTEP_CONFIG_FILE=/Library/GNUstep/GNUstep.conf ;;
|
||||
*) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;;
|
||||
*) case x"$GNUSTEP_PREFIX" in
|
||||
x) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf;;
|
||||
x/usr) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf;;
|
||||
x/usr/GNUstep) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf;;
|
||||
*) GNUSTEP_CONFIG_FILE="$GNUSTEP_PREFIX/etc/GNUstep/GNUstep.conf";;
|
||||
esac ;;
|
||||
esac
|
||||
fi
|
||||
if echo "$GNUSTEP_CONFIG_FILE" | grep '[ \\] > /dev/null'
|
||||
|
|
|
|||
16
configure.ac
16
configure.ac
|
|
@ -496,15 +496,25 @@ GNUSTEP_LOCAL_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_DOC_INFO"
|
|||
AC_MSG_CHECKING([for GNUstep configuration file to use])
|
||||
AC_ARG_WITH(config-file,[
|
||||
--with-config-file=PATH
|
||||
Set the path of the system GNUstep config file. Use this option
|
||||
if you want to have the GNUstep config file in a non-standard place.
|
||||
Set the path of the system GNUstep config file. Use this option
|
||||
if you want to have the GNUstep config file in a non-standard
|
||||
place.
|
||||
Example: --with-config-file=/usr/GNUstep/GNUstep.conf
|
||||
By default, if this option is not specified, the config file is
|
||||
/etc/GNUstep/GNUstep.conf if the prefix is /, /usr or /usr/GNUstep
|
||||
and $prefix/etc/GNUstep/GNUstep.conf otherwise. On Apple, it is
|
||||
always /Library/GNUstep/GNUstep.conf regardless of prefix.
|
||||
],
|
||||
GNUSTEP_CONFIG_FILE="$withval",)
|
||||
if test "$GNUSTEP_CONFIG_FILE" = "" -o "$GNUSTEP_CONFIG_FILE" = "no"; then
|
||||
case "$target_os" in
|
||||
darwin*) GNUSTEP_CONFIG_FILE=/Library/GNUstep/GNUstep.conf ;;
|
||||
*) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf ;;
|
||||
*) case x"$GNUSTEP_PREFIX" in
|
||||
x) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf;;
|
||||
x/usr) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf;;
|
||||
x/usr/GNUstep) GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf;;
|
||||
*) GNUSTEP_CONFIG_FILE="$GNUSTEP_PREFIX/etc/GNUstep/GNUstep.conf";;
|
||||
esac ;;
|
||||
esac
|
||||
fi
|
||||
if echo "$GNUSTEP_CONFIG_FILE" | grep '[[ \\]] > /dev/null'
|
||||
|
|
|
|||
Loading…
Reference in a new issue