mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 14:20:50 +00:00
Fixed setting GNUSTEP_USER_ROOT in case GNUSTEP_FLATTENED
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13007 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6fa2c09625
commit
02b37ccad3
3 changed files with 18 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
|||
Tue Mar 5 14:37:58 2002 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* GNUstep.sh.in (GNUSTEP_USER_ROOT): Fixed setting in case
|
||||
GNUSTEP_FLATTENED (Suggestion from Marcus Müller
|
||||
<znek@mulle-kybernetik.com>).
|
||||
* GNUstep.csh.in: Idem.
|
||||
|
||||
Tue Mar 5 13:54:36 2002 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* Master/rules.make (COMPONENTS, LANGUAGES,
|
||||
|
|
|
@ -64,7 +64,11 @@ if ( ! ${?GNUSTEP_HOST_OS} ) then
|
|||
setenv GNUSTEP_HOST_OS `${GNUSTEP_MAKEFILES}/clean_os.sh ${GNUSTEP_HOST_OS}`
|
||||
endif
|
||||
|
||||
setenv GNUSTEP_USER_ROOT `${GNUSTEP_MAKEFILES}/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/user_home user`
|
||||
if ( "${GNUSTEP_FLATTENED}" == "" ) then
|
||||
setenv GNUSTEP_USER_ROOT `${GNUSTEP_MAKEFILES}/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/user_home user`
|
||||
else
|
||||
setenv GNUSTEP_USER_ROOT `${GNUSTEP_MAKEFILES}/user_home user`
|
||||
endif
|
||||
|
||||
#
|
||||
# Add the GNUstep tools directories to the path
|
||||
|
|
|
@ -82,7 +82,12 @@ export GNUSTEP_HOST GNUSTEP_HOST_CPU GNUSTEP_HOST_VENDOR GNUSTEP_HOST_OS
|
|||
#
|
||||
# Ask the user_home tool for the root path.
|
||||
#
|
||||
GNUSTEP_USER_ROOT=`$GNUSTEP_MAKEFILES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/user_home user`
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
GNUSTEP_USER_ROOT=`$GNUSTEP_MAKEFILES/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/user_home user`
|
||||
else
|
||||
GNUSTEP_USER_ROOT=`$GNUSTEP_MAKEFILES/user_home user`
|
||||
fi
|
||||
|
||||
export GNUSTEP_USER_ROOT
|
||||
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue