From: serassio <>
Date: Wed, 22 Dec 2004 00:18:40 +0000 (+0000)
Subject: change automake --force to -f - different automakes use different long versions
X-Git-Tag: SQUID_3_0_PRE4~960
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e0237d6900ea3fe88ef7f0d6e0eeba7210b5bff;p=thirdparty%2Fsquid.git

change automake --force to -f - different automakes use different long versions
---

diff --git a/bootstrap.sh b/bootstrap.sh
index cb3e604478..d81ad41d5d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -78,7 +78,7 @@ do
 	    bootstrap aclocal$amver
 	    bootstrap autoheader$acver
 	    bootstrap libtoolize --force --copy --automake
-	    bootstrap automake$amver --foreign --add-missing --copy --force
+	    bootstrap automake$amver --foreign --add-missing --copy -f
 	    bootstrap autoconf$acver
 	fi ); then
 	    : # OK
diff --git a/lib/cppunit-1.10.0/bootstrap.sh b/lib/cppunit-1.10.0/bootstrap.sh
index 8cfc61da2e..956977e59e 100755
--- a/lib/cppunit-1.10.0/bootstrap.sh
+++ b/lib/cppunit-1.10.0/bootstrap.sh
@@ -67,5 +67,5 @@ if grep m4_regex aclocal.m4 >/dev/null; then
 fi
 bootstrap autoheader$acver
 bootstrap libtoolize --automake --force --copy
-bootstrap automake$amver --add-missing --force --copy
+bootstrap automake$amver --add-missing -f --copy
 bootstrap autoconf$acver