X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fbootstrap;h=1e66948ce7f6b646cb138517c83f8fd4378264e7;hb=3ce4684ba034e0e9e3c7b78768560dcf31d07b12;hp=69b215a5192b5ed6213057e1a65c79380303d355;hpb=6b110186fdaa69a692e9bd04b92deac281cab797;p=synfig.git

diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap
index 69b215a..1e66948 100755
--- a/synfig-studio/trunk/bootstrap
+++ b/synfig-studio/trunk/bootstrap
@@ -26,6 +26,7 @@ s/@PACKAGE_TARNAME@/$PACKAGE_TARNAME/g;
 s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;
 s|@SVN_REPOSITORY@|$SVN_REPOSITORY|g;
 s/@VERSION@/$VERSION/g;
+s/@API_VERSION@/$API_VERSION/g;
 s/@VERSION_MAJ@/$VERSION_MAJ/g;
 s/@VERSION_MIN@/$VERSION_MIN/g;
 s/@VERSION_REV@/$VERSION_REV/g;
@@ -58,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.
@@ -155,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
@@ -167,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
 ) ||
 {