X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fbootstrap;h=8f3ad995271b2c4e9e549763af223e6c27d16e12;hb=f50724e2c8afbe39fd7770b79fae2864f96cc5e9;hp=eedaaea43058272bd50ecefa8953b7661359a063;hpb=eba6104ea039023f7038f06b4e60bb4d73188699;p=synfig.git

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index eedaaea..8f3ad99 100755
--- a/synfig-core/trunk/bootstrap
+++ b/synfig-core/trunk/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # Synfig Bootstrap Script
-# $Id: bootstrap,v 1.2 2005/01/10 07:40:26 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,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;
@@ -58,7 +58,7 @@ cleanup () {
 	rm -fr config.cache autom4te*.cache configure.in $TEMPFILE
 }
 
-output Prepairing build environment for $PACKAGE-$VERSION...
+output Preparing build environment for $PACKAGE-$VERSION...
 
 # Look for the CVS directory. If we don't find it, we need to
 # ask the user if they know what they are doing.
@@ -143,21 +143,25 @@ 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...
 mv pkgconfig.pc "$PACKAGE_TARNAME.pc.in"
 
-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 NEWS >> "$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 Generating ChangeLog from SVN
+if test x != "x$VERSION_REL" ; then export REVISION="--revision $VERSION_REL" ; fi
+test -f ChangeLog || svn2cl --include-rev $REVISION $SVN_REPOSITORY/trunk/ || touch ChangeLog
 
 output Setting up build environment...
 
@@ -167,10 +171,10 @@ 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 &&
+	automake --force-missing --add-missing --include-deps &&
 	true
 ) ||
 {
@@ -190,11 +194,11 @@ set +x
 	set -x
 	(
 		cd libltdl &&
-		( echo "AC_CONFIG_AUX_DIR(../config)" >> configure.[ai][cn] ) &&
-		aclocal -I $CONFIG_DIR &&
+		( echo "AC_CONFIG_AUX_DIR(../config)" >> configure.* ) &&
+		aclocal -I "../$CONFIG_DIR" &&
 		autoheader &&
 		autoconf &&
-		automake --foreign --add-missing --copy
+		automake --force-missing --add-missing --include-deps 
 	) ||
 	{
 		# Something went wrong...
@@ -310,6 +314,6 @@ output Complete.
 cleanup;
 
 # Move back to the current directory
-cd $CURR_DIR
+cd "$CURR_DIR"
 
 make -C src/synfig/proto