Bump the version numbers ready for the coming release.

[synfig.git] / synfig-studio / trunk / bootstrap

diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap
index a0e48bb..1e66948 100755 (executable)
--- 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
 ) ||
 {