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

Handle backslashes in paths.

Browse source 
Fix GNUSTEP_MAKEFILES error reported by Chris Vetter.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@22115 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-11-28 20:53:37 +00:00
parent b94811c970
commit 7197cfdf0f
6 changed files with 633 additions and 333 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2005-11-28 Richard Frith-Macdonald <rfm@gnu.org>
* GNUstep.conf.in: Use new variables for handling backslashes in
paths.
* GNUstep.csh.in: ditto
* GNUstep.sh.in: ditto
* configure.ac: Always make GNUSTEP_MAKEFILES the Library/Makefiles
subdirectory of the sytem root. Create new variables containing
escaped backslashes to handle being given a backslash in a path.
* configure: regenerate
2005-11-21 Richard Frith-Macdonald <rfm@gnu.org>
opentool.in:

12
GNUstep.conf.in
View file

@ -14,10 +14,10 @@
## not be used while building.
##
GNUSTEP_SYSTEM_ROOT=@GNUSTEP_SYSTEM_ROOT@
GNUSTEP_LOCAL_ROOT=@GNUSTEP_LOCAL_ROOT@
GNUSTEP_NETWORK_ROOT=@GNUSTEP_NETWORK_ROOT@
GNUSTEP_SYSTEM_ROOT=@GNUSTEP_SHELL_SYSTEM_ROOT@
GNUSTEP_LOCAL_ROOT=@GNUSTEP_SHELL_LOCAL_ROOT@
GNUSTEP_NETWORK_ROOT=@GNUSTEP_SHELL_NETWORK_ROOT@
GNUSTEP_USER_CONFIG_FILE=@GNUSTEP_USER_CONFIG_FILE@
GNUSTEP_USER_DIR=@GNUSTEP_USER_DIR@
GNUSTEP_USER_DEFAULTS_DIR=@GNUSTEP_USER_DEFAULTS_DIR@
GNUSTEP_USER_CONFIG_FILE=@GNUSTEP_SHELL_USER_CONFIG_FILE@
GNUSTEP_USER_DIR=@GNUSTEP_SHELL_USER_DIR@
GNUSTEP_USER_DEFAULTS_DIR=@GNUSTEP_SHELL_USER_DEFAULTS_DIR@

12
GNUstep.csh.in
View file

@ -34,12 +34,12 @@
# Determine the location of the system configuration file
if ( ! ${?GNUSTEP_CONFIG_FILE} ) then
setenv GNUSTEP_CONFIG_FILE "@GNUSTEP_CONFIG_FILE@"
setenv GNUSTEP_CONFIG_FILE "@GNUSTEP_SHELL_CONFIG_FILE@"
endif
# Determine the location of the user configuration file
if ( ! ${?GNUSTEP_USER_CONFIG_FILE} ) then
setenv GNUSTEP_USER_CONFIG_FILE "@GNUSTEP_USER_CONFIG_FILE@"
setenv GNUSTEP_USER_CONFIG_FILE "@GNUSTEP_SHELL_USER_CONFIG_FILE@"
endif
# Read the system configuration file
@ -95,15 +95,15 @@ endif
# Now, set any essential variable (that is not already set) to the
# built-in values.
if ( ! ${?GNUSTEP_SYSTEM_ROOT} ) then
setenv GNUSTEP_SYSTEM_ROOT "@GNUSTEP_SYSTEM_ROOT@"
setenv GNUSTEP_SYSTEM_ROOT "@GNUSTEP_SHELL_SYSTEM_ROOT@"
endif
if ( ! ${?GNUSTEP_LOCAL_ROOT} ) then
setenv GNUSTEP_LOCAL_ROOT "@GNUSTEP_LOCAL_ROOT@"
setenv GNUSTEP_LOCAL_ROOT "@GNUSTEP_SHELL_LOCAL_ROOT@"
endif
if ( ! ${?GNUSTEP_NETWORK_ROOT} ) then
setenv GNUSTEP_NETWORK_ROOT "@GNUSTEP_NETWORK_ROOT@"
setenv GNUSTEP_NETWORK_ROOT "@GNUSTEP_SHELL_NETWORK_ROOT@"
endif
@ -117,7 +117,7 @@ if ( ! ${?GNUSTEP_MAKEFILES} ) then
endif
if ( ! ${?GNUSTEP_USER_DIR} ) then
setenv GNUSTEP_USER_DIR "@GNUSTEP_USER_DIR@"
setenv GNUSTEP_USER_DIR "@GNUSTEP_SHELL_USER_DIR@"
endif
#

12
GNUstep.sh.in
View file

@ -78,12 +78,12 @@ fi
# Determine the location of the system configuration file
if [ -z "$GNUSTEP_CONFIG_FILE" ]; then
GNUSTEP_CONFIG_FILE=@GNUSTEP_CONFIG_FILE@
GNUSTEP_CONFIG_FILE=@GNUSTEP_SHELL_CONFIG_FILE@
fi
# Determine the location of the user configuration file
if [ -z "$GNUSTEP_USER_CONFIG_FILE" ]; then
GNUSTEP_USER_CONFIG_FILE=@GNUSTEP_USER_CONFIG_FILE@
GNUSTEP_USER_CONFIG_FILE=@GNUSTEP_SHELL_USER_CONFIG_FILE@
fi
# Read the system configuration file
@ -112,15 +112,15 @@ fi
# Now, set any essential variable (that is not already set) to the
# built-in values.
if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
GNUSTEP_SYSTEM_ROOT=@GNUSTEP_SYSTEM_ROOT@
GNUSTEP_SYSTEM_ROOT=@GNUSTEP_SHELL_SYSTEM_ROOT@
fi
if [ -z "$GNUSTEP_LOCAL_ROOT" ]; then
GNUSTEP_LOCAL_ROOT=@GNUSTEP_LOCAL_ROOT@
GNUSTEP_LOCAL_ROOT=@GNUSTEP_SHELL_LOCAL_ROOT@
fi
if [ -z "$GNUSTEP_NETWORK_ROOT" ]; then
GNUSTEP_NETWORK_ROOT=@GNUSTEP_NETWORK_ROOT@
GNUSTEP_NETWORK_ROOT=@GNUSTEP_SHELL_NETWORK_ROOT@
fi
export GNUSTEP_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT
@ -137,7 +137,7 @@ fi
export GNUSTEP_MAKEFILES
if [ -z "$GNUSTEP_USER_DIR" ]; then
GNUSTEP_USER_DIR=@GNUSTEP_USER_DIR@
GNUSTEP_USER_DIR=@GNUSTEP_SHELL_USER_DIR@
fi
#

893
configure vendored
View file

File diff suppressed because it is too large Load diff

26
configure.ac
View file

@ -309,7 +309,6 @@ else
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
#--------------------------------------------------------------------
@ -441,12 +440,8 @@ AC_SUBST(GNUSTEP_USER_DEFAULTS_DIR)
#--------------------------------------------------------------------
# Setting up GNUSTEP_MAKEFILES
#--------------------------------------------------------------------
AC_MSG_CHECKING(for GNUSTEP_MAKEFILES to use)
if test "$GNUSTEP_MAKEFILES" = ""; then
GNUSTEP_MAKEFILES="$GNUSTEP_SYSTEM_ROOT/Library/Makefiles"
fi
GNUSTEP_MAKEFILES="$GNUSTEP_SYSTEM_ROOT/Library/Makefiles"
AC_SUBST(GNUSTEP_MAKEFILES)
AC_MSG_RESULT($GNUSTEP_MAKEFILES)
#--------------------------------------------------------------------
# Setting up the install-sh script
@ -897,6 +892,25 @@ AC_SUBST(clean_target_cpu)
AC_SUBST(clean_target_vendor)
AC_SUBST(target)
#-------------------------------------------------------------------
# Record paths for use in shell scripts ... with backslashes quoted.
#-------------------------------------------------------------------
GNUSTEP_SHELL_SYSTEM_ROOT=`echo $GNUSTEP_SYSTEM_ROOT|sed -e 's/\\\\/\\\\\\\\/g'`
AC_SUBST(GNUSTEP_SHELL_SYSTEM_ROOT)
GNUSTEP_SHELL_NETWORK_ROOT=`echo $GNUSTEP_NETWORK_ROOT|sed -e 's/\\\\/\\\\\\\\/g'`
AC_SUBST(GNUSTEP_SHELL_NETWORK_ROOT)
GNUSTEP_SHELL_LOCAL_ROOT=`echo $GNUSTEP_LOCAL_ROOT|sed -e 's/\\\\/\\\\\\\\/g'`
AC_SUBST(GNUSTEP_SHELL_LOCAL_ROOT)
GNUSTEP_SHELL_USER_DIR=`echo $GNUSTEP_USER_DIR|sed -e 's/\\\\/\\\\\\\\/g'`
AC_SUBST(GNUSTEP_SHELL_USER_DIR)
GNUSTEP_SHELL_USER_DEFAULTS_DIR=`echo $GNUSTEP_USER_DEFAULTS_DIR|sed -e 's/\\\\/\\\\\\\\/g'`
AC_SUBST(GNUSTEP_SHELL_USER_DEFAULTS_DIR)
GNUSTEP_SHELL_USER_CONFIG_FILE=`echo $GNUSTEP_USER_CONFIG_FILE|sed -e 's/\\\\/\\\\\\\\/g'`
AC_SUBST(GNUSTEP_SHELL_USER_CONFIG_FILE)
GNUSTEP_SHELL_CONFIG_FILE=`echo $GNUSTEP_CONFIG_FILE|sed -e 's/\\\\/\\\\\\\\/g'`
AC_SUBST(GNUSTEP_SHELL_CONFIG_FILE)
#--------------------------------------------------------------------
# Produce the output files
#--------------------------------------------------------------------