gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed --prefix option in configure that should take precedence over inherited

Browse source 
path variables or existing config file


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21843 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2005-10-18 21:06:10 +00:00
parent e1c31a72de
commit 30e5a8df9a
3 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-10-18 Nicola Pero <n.pero@mi.flashnet.it>
* configure.ac: Make sure that --prefix=xxx takes precedence over
paths read from GNUstep.conf or inherited from the environment.
* configure: Regenerated.
2005-10-17 Adam Fedor <fedor@gnu.org>
* target.make (netbsd): Remove static libs version of netbsd

15
configure vendored
View file

@ -3257,7 +3257,10 @@ echo "${ECHO_T}$GNUSTEP_CONFIG_FILE" >&6
# Reading/importing the existing configuration file is good as a
# default because it means that you don't have to type in your
# GNUSTEP_SYSTEM_ROOT, GNUSTEP_LOCAL_ROOT, etc. settings every time
# you configure gnustep-make.
# you configure gnustep-make. (please note we only read the
# system-wide one, not the user one. Reason being that the settings
# we read will be used to generate the new system-wide one, while the
# user one will be left untouched).
# It can be annoying in certain cases though; this option lets you
# turn it off
@ -3343,6 +3346,16 @@ if test "x$prefix" = "xNONE"; then
GNUSTEP_ROOT="$ac_default_prefix" ;
else
GNUSTEP_ROOT="$prefix";
# Set the values for all those variables ovverriding anything read
# from the configuration file or inherited from the environment.
# The --prefix=xxx option should overwrite those. Please notice
# that the --with-system-root=xxx (and similar) options are
# processed later as overwrite --prefix=xxx in their specific area.
GNUSTEP_SYSTEM_ROOT="$GNUSTEP_ROOT/System";
GNUSTEP_LOCAL_ROOT="$GNUSTEP_ROOT/Local";
GNUSTEP_NETWORK_ROOT="$GNUSTEP_LOCAL_ROOT";
GNUSTEP_MAKEFILES="$GNUSTEP_SYSTEM_ROOT/Library/Makefiles"
fi
#--------------------------------------------------------------------

10
configure.ac
View file

@ -271,6 +271,16 @@ if test "x$prefix" = "xNONE"; then
GNUSTEP_ROOT="$ac_default_prefix" ;
else
GNUSTEP_ROOT="$prefix";
# Set the values for all those variables ovverriding anything read
# from the configuration file or inherited from the environment.
# The --prefix=xxx option should overwrite those. Please notice
# that the --with-system-root=xxx (and similar) options are
# processed later as overwrite --prefix=xxx in their specific area.
GNUSTEP_SYSTEM_ROOT="$GNUSTEP_ROOT/System";
GNUSTEP_LOCAL_ROOT="$GNUSTEP_ROOT/Local";
GNUSTEP_NETWORK_ROOT="$GNUSTEP_LOCAL_ROOT";
GNUSTEP_MAKEFILES="$GNUSTEP_SYSTEM_ROOT/Library/Makefiles"
fi
#--------------------------------------------------------------------