From 58748f175cc00939b16dac1ae75334f030d181f8 Mon Sep 17 00:00:00 2001 From: pabs Date: Mon, 14 Aug 2006 08:17:14 +0000 Subject: [PATCH] Allow synfig to bootstrap in directories with spaces in their names. git-svn-id: http://svn.voria.com/code@217 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/bootstrap | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap index d44a45f..b4915b4 100755 --- a/synfig-core/trunk/bootstrap +++ b/synfig-core/trunk/bootstrap @@ -14,7 +14,7 @@ cd "$(dirname $0)" # Environment Variables BOOTSTRAP_NAME="$(basename $0)" -CONFIG_DIR="$(pwd)/config" +CONFIG_DIR="config" [ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -m -s "$CONFIG_DIR"`" [ -x /bin/cygpath ] && CONFIG_DIR="`cygpath -u "$CONFIG_DIR"`" @@ -29,7 +29,7 @@ export WANT_AUTOMAKE=1.8 export WANT_AUTOCONF_2_5=1 export WANT_AUTOCONF=2.5 -. $CONFIG_DIR/build.cfg +. "$CONFIG_DIR/build.cfg" SED_SCRIPT=" s/@PACKAGE@/$PACKAGE/g; @@ -143,7 +143,7 @@ RECONFIG_LTDL=1 for FILENAME in doxygen.cfg pkgconfig.pc project.spec ; do { output Creating $FILENAME... -sed "$SED_SCRIPT" < $CONFIG_DIR/$FILENAME.in > $FILENAME; +sed "$SED_SCRIPT" < "$CONFIG_DIR/$FILENAME.in" > $FILENAME; } ; done output Renaming pkgconfig.pc to $PACKAGE_TARNAME.pc.in... @@ -157,7 +157,7 @@ echo %changelog >> "$PACKAGE.spec" cat NEWS >> "$PACKAGE.spec" output Creating configure.in from configure.ac... -sed "$SED_SCRIPT" < $CONFIG_DIR/configure.ac > configure.in; +sed "$SED_SCRIPT" < "$CONFIG_DIR/configure.ac" > configure.in; output Setting up build environment... @@ -167,7 +167,7 @@ set -x # Create all of the build environment files ( libtoolize -c -f --ltdl && - aclocal -I $CONFIG_DIR $ACLOCAL_FLAGS && + aclocal -I "$CONFIG_DIR" $ACLOCAL_FLAGS && autoheader && autoconf -o configure && automake --foreign --add-missing --copy --include-deps && @@ -191,7 +191,7 @@ set +x ( cd libltdl && ( echo "AC_CONFIG_AUX_DIR(../config)" >> configure.[ai][cn] ) && - aclocal -I $CONFIG_DIR && + aclocal -I "../$CONFIG_DIR" && autoheader && autoconf && automake --foreign --add-missing --copy @@ -310,6 +310,6 @@ output Complete. cleanup; # Move back to the current directory -cd $CURR_DIR +cd "$CURR_DIR" make -C src/synfig/proto -- 2.7.4