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

diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap
index a0e48bb..1e66948 100755
--- a/synfig-studio/trunk/bootstrap
+++ b/synfig-studio/trunk/bootstrap
@@ -59,7 +59,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.
@@ -156,6 +156,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
@@ -168,8 +172,8 @@ set -x
 	$ACLOCAL -I "$CONFIG_DIR" $ACLOCAL_FLAGS &&
 	aclocalfix &&
 	$AUTOHEADER &&
-	$AUTOMAKE --foreign --add-missing --copy --include-deps &&
 	$AUTOCONF -o configure &&
+	$AUTOMAKE --force-missing --add-missing --include-deps &&
 	true
 ) ||
 {