projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change automake invocation to use symlinks and use the stricter gnu standards
[synfig.git]
/
synfig-studio
/
trunk
/
bootstrap
diff --git
a/synfig-studio/trunk/bootstrap
b/synfig-studio/trunk/bootstrap
index
69b215a
..
e3283bf
100755
(executable)
--- 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/@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.
@@
-167,8
+168,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
) ||
{