X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fbootstrap;h=69b215a5192b5ed6213057e1a65c79380303d355;hb=8409f0ca72de5e095c627f15cea02b872f1911d8;hp=c4f02673785b5f83289a1fcd08370dbb336aeb46;hpb=263524301a209ceb5fbbf6bd1c4c0cbb73a7efb8;p=synfig.git

diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap
index c4f0267..69b215a 100755
--- a/synfig-studio/trunk/bootstrap
+++ b/synfig-studio/trunk/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # Synfig Studio Bootstrap Script
-# $Id: bootstrap,v 1.2 2005/01/10 08:13:44 darco Exp $
+# $Id$
 # 
 # This script creates the configure script and Makefile.in files,
 # and also fixes a few things in both to ensure a smooth build
@@ -14,9 +14,9 @@ cd $(dirname $0)
 
 # Environment Variables
 BOOTSTRAP_NAME=$(basename $0)
-CONFIG_DIR=$(pwd)/config
+CONFIG_DIR="config"
 
-. $CONFIG_DIR/build.cfg
+. "$CONFIG_DIR/build.cfg"
 
 SED_SCRIPT="
 s/@PACKAGE@/$PACKAGE/g;
@@ -142,7 +142,7 @@ mv $TEMPFILE aclocal.m4
 
 for FILENAME in 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 project.spec to $PACKAGE.spec...
@@ -150,10 +150,10 @@ mv project.spec "$PACKAGE.spec"
 
 output Finishing up $PACKAGE.spec...
 echo %changelog >> "$PACKAGE.spec"
-cat 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...
 
@@ -164,7 +164,7 @@ set -x
 (
 #	$INTLTOOLIZE -c &&
 	$LIBTOOLIZE -c -f &&
-	$ACLOCAL -I $CONFIG_DIR $ACLOCAL_FLAGS &&
+	$ACLOCAL -I "$CONFIG_DIR" $ACLOCAL_FLAGS &&
 	aclocalfix &&
 	$AUTOHEADER &&
 	$AUTOMAKE --foreign --add-missing --copy --include-deps &&
@@ -250,4 +250,4 @@ echo $BOOTSTRAP_NAME: Complete.
 cleanup;
 
 # Move back to the current directory
-cd $CURR_DIR
+cd "$CURR_DIR"