X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fbootstrap;h=a0e48bb7aa0ae54d101a22e8fb5a7ad27ba4df41;hb=4827ae1c4f7f5383655496e7556f67908e1db697;hp=579e7be0931d917d91fc9a7b44a21cb54769b3ae;hpb=b598ea2fa00cfacaa74313c585e4f107752f2a25;p=synfig.git

diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap
index 579e7be..a0e48bb 100755
--- a/synfig-studio/trunk/bootstrap
+++ b/synfig-studio/trunk/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
-# Sinfg Studio Bootstrap Script
-# $Id: bootstrap,v 1.2 2005/01/10 08:13:44 darco Exp $
+# Synfig Studio Bootstrap Script
+# $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;
@@ -26,6 +26,7 @@ s/@PACKAGE_TARNAME@/$PACKAGE_TARNAME/g;
 s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;
 s|@SVN_REPOSITORY@|$SVN_REPOSITORY|g;
 s/@VERSION@/$VERSION/g;
+s/@API_VERSION@/$API_VERSION/g;
 s/@VERSION_MAJ@/$VERSION_MAJ/g;
 s/@VERSION_MIN@/$VERSION_MIN/g;
 s/@VERSION_REV@/$VERSION_REV/g;
@@ -142,18 +143,18 @@ 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-$VERSION.spec...
-mv project.spec "$PACKAGE-$VERSION.spec"
+output Renaming project.spec to $PACKAGE.spec...
+mv project.spec "$PACKAGE.spec"
 
-output Finishing up $PACKAGE-$VERSION.spec...
-echo %changelog >> "$PACKAGE-$VERSION.spec"
-cat ChangeLog >> "$PACKAGE-$VERSION.spec"
+output Finishing up $PACKAGE.spec...
+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...
 
@@ -164,7 +165,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 &&
@@ -186,7 +187,7 @@ set +x
 #sed "
 #s/g++ c++/g++3 g++ c++/;
 #s/gcc cc/gcc3 gcc cc/;
-#s:"'${prefix}/include'":"'${prefix}/include/sinfg'":;
+#s:"'${prefix}/include'":"'${prefix}/include/synfig'":;
 #s:PREFIX/include:PREFIX/include/ETL:;
 #" < configure > $TEMPFILE
 #cp $TEMPFILE configure
@@ -250,4 +251,4 @@ echo $BOOTSTRAP_NAME: Complete.
 cleanup;
 
 # Move back to the current directory
-cd $CURR_DIR
+cd "$CURR_DIR"