X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fbootstrap;h=8f3ad995271b2c4e9e549763af223e6c27d16e12;hb=17a5e4ee35657ec52a5aca9b3a426052ef1cd01a;hp=67951955efe3a7d432db33523d0a2ff75d9ba887;hpb=ca91963497a9ff21d56243ab1b27affc1cb17b5f;p=synfig.git

diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap
index 6795195..8f3ad99 100755
--- a/synfig-core/trunk/bootstrap
+++ b/synfig-core/trunk/bootstrap
@@ -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.
@@ -159,6 +159,10 @@ 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
@@ -170,7 +174,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 &&
 	true
 ) ||
 {
@@ -190,11 +194,11 @@ set +x
 	set -x
 	(
 		cd libltdl &&
-		( echo "AC_CONFIG_AUX_DIR(../config)" >> configure.[ai][cn] ) &&
+		( 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...