projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Type: 'segmentsssss' -> 'segments'.
[synfig.git]
/
synfig-studio
/
trunk
/
bootstrap
diff --git
a/synfig-studio/trunk/bootstrap
b/synfig-studio/trunk/bootstrap
index
3be6501
..
1e66948
100755
(executable)
--- a/
synfig-studio/trunk/bootstrap
+++ b/
synfig-studio/trunk/bootstrap
@@
-1,7
+1,7
@@
#! /bin/sh
#
# Synfig Studio Bootstrap Script
#! /bin/sh
#
# Synfig Studio Bootstrap Script
-# $Id
: bootstrap,v 1.2 2005/01/10 08:13:44 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
#
# This script creates the configure script and Makefile.in files,
# and also fixes a few things in both to ensure a smooth build
@@
-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/@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;
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
}
rm -fr config.cache autom4te*.cache configure.in $TEMPFILE
}
-output Prepa
i
ring 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.
# 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 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
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 &&
$ACLOCAL -I "$CONFIG_DIR" $ACLOCAL_FLAGS &&
aclocalfix &&
$AUTOHEADER &&
- $AUTOMAKE --foreign --add-missing --copy --include-deps &&
$AUTOCONF -o configure &&
$AUTOCONF -o configure &&
+ $AUTOMAKE --force-missing --add-missing --include-deps &&
true
) ||
{
true
) ||
{