Unset GNUSTEP_USER_DIR after using it

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@25943 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2008-01-14 10:41:13 +00:00
parent edb9902d3a
commit 3f41b31eaa
3 changed files with 10 additions and 0 deletions

View file

@ -6,6 +6,8 @@
* configure: Regenerated.
* gnustep-config.in: Updated help removing mention of
GNUSTEP_USER_DIR.
* GNUstep.sh.in: Unset GNUSTEP_USER_DIR after using it.
* GNUstep.csh.in: Same change.
2008-01-14 Nicola Pero <nicola.pero@meta-innovation.com>

View file

@ -135,6 +135,8 @@ switch ("${GNUSTEP_USER_DIR}")
breaksw
endsw
unsetenv GNUSTEP_USER_DIR
if ( "@GNUSTEP_MULTI_PLATFORM@" == "" ) then
setenv GNUSTEP_HOST "@target@"
setenv GNUSTEP_HOST_CPU "@clean_target_cpu@"

View file

@ -143,12 +143,14 @@ if [ -z "$GNUSTEP_MAKEFILES" ]; then
fi
export GNUSTEP_MAKEFILES
# GNUSTEP_USER_DIR is deprecated and will be removed
if [ -z "$GNUSTEP_USER_DIR" ]; then
GNUSTEP_USER_DIR=@GNUSTEP_USER_DIR@
fi
#
# Set GNUSTEP_USER_ROOT which is the variable used in practice
# GNUSTEP_USER_ROOT is deprecated and will be removed
#
case "$GNUSTEP_USER_DIR" in
/*) # An absolute path
@ -157,6 +159,10 @@ case "$GNUSTEP_USER_DIR" in
GNUSTEP_USER_ROOT="$GNUSTEP_HOME/$GNUSTEP_USER_DIR";;
esac
# This variable was used to set up GNUSTEP_USER_ROOT which is the one
# that is actually exported; we can now drop it from the environment.
unset GNUSTEP_USER_DIR
# This is deprecated and will be removed
export GNUSTEP_USER_ROOT