X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2Fbootstrap;h=549b442af8d3ec8ff45f932c9184f6bb95786dd8;hb=43c8bde58c265bc281f885ab80b9c07774e8667a;hp=204c51078d2d699315fa4be4c3181eab5382d195;hpb=c1f2fb1ce9e86d8d4ca5bdd69b4f9b2ef7f13b40;p=synfig.git

diff --git a/ETL/trunk/bootstrap b/ETL/trunk/bootstrap
index 204c510..549b442 100755
--- a/ETL/trunk/bootstrap
+++ b/ETL/trunk/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # Extended Template Library Bootstrap Script
-# $Id: bootstrap,v 1.2 2005/01/04 01:54:14 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
@@ -15,7 +15,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"`"
@@ -57,7 +57,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.
@@ -127,11 +127,15 @@ 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;
 
+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...
 
 # Set the shell to output what we are doing
@@ -142,7 +146,7 @@ set -x
 	aclocal -I "$CONFIG_DIR" $ACLOCAL_FLAGS &&
 	autoheader &&
 	autoconf -o configure &&
-	automake --foreign --add-missing --copy --include-deps 
+	automake --force-missing --add-missing --include-deps 
 ) ||
 {
 	# Something went wrong...
@@ -213,4 +217,4 @@ echo $BOOTSTRAP_NAME: Complete.
 cleanup;
 
 # Move back to the current directory
-cd $CURR_DIR
+cd "$CURR_DIR"