LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix builds in directory names containing spaces 

Prevent ./configure failure when run from a directory
such as "/home/bob/my own sogo directory/"
pull/213/head
Patrice Levesque 2016-06-09 15:17:14 -04:00
parent d6d3e49158
commit fa78566d72
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# Note: When adding make options to this script, ensure that the source still # Note: When adding make options to this script, ensure that the source still
@ -12,7 +12,7 @@
TOPDIR="$(cd `dirname $0`; pwd)" TOPDIR="$(cd `dirname $0`; pwd)"
# we ensure that the configure script is run from TOPDIR # we ensure that the configure script is run from TOPDIR
cd $TOPDIR cd "${TOPDIR}"
CFG_ARGS="$0 $1 $2 $3 $4 $5 $6 $7 $8 $9" CFG_ARGS="$0 $1 $2 $3 $4 $5 $6 $7 $8 $9"
@ -212,7 +212,7 @@ printGNUstepSetup() {
} }
cfgwrite() { cfgwrite() {
echo "$1" >> $ARG_CFGMAKE echo "$1" >> "${ARG_CFGMAKE}"
} }
genConfigMake() { genConfigMake() {
@ -226,7 +226,7 @@ genConfigMake() {
echo "creating: $ARG_CFGMAKE" echo "creating: $ARG_CFGMAKE"
fi fi
echo "# GNUstep environment configuration" > $ARG_CFGMAKE echo "# GNUstep environment configuration" > "${ARG_CFGMAKE}"
cfgwrite "# created by: '$CFG_ARGS'" cfgwrite "# created by: '$CFG_ARGS'"
cfgwrite "" cfgwrite ""
@ -235,7 +235,7 @@ genConfigMake() {
cfgwrite "# $MAKE debug=yes" cfgwrite "# $MAKE debug=yes"
cfgwrite "" cfgwrite ""
cfgwrite "TOPDIR:=$TOPDIR" cfgwrite "TOPDIR:=$( sed 's/ /\\\ /g' <<< ${TOPDIR} )"
cfgwrite "" cfgwrite ""
cfgwrite "NEEDS_GUI=no" cfgwrite "NEEDS_GUI=no"
@ -321,7 +321,7 @@ genConfigMake() {
checkLinking() { checkLinking() {
# library-name => $1, type => $2 # library-name => $1, type => $2
local oldpwd=$PWD local oldpwd="${PWD}"
local tmpdir=".configure-test-$$" local tmpdir=".configure-test-$$"
mkdir $tmpdir mkdir $tmpdir
@ -371,7 +371,7 @@ EOF
fi fi
fi fi
cd $oldpwd cd "${oldpwd}"
rm -rf $tmpdir rm -rf $tmpdir
return $LINK_RESULT return $LINK_RESULT