projects
/
platform
/
upstream
/
gnome-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1013622
)
Do not call automake with --force, bug 612329
author
David King
<amigadave@amigadave.com>
Mon, 30 Jul 2012 16:13:19 +0000
(17:13 +0100)
committer
David King
<amigadave@amigadave.com>
Mon, 30 Jul 2012 16:13:19 +0000
(17:13 +0100)
The --force option for automake is not documented, so gnome-autogen.sh
should not use it.
macros2/gnome-autogen.sh
patch
|
blob
|
history
diff --git
a/macros2/gnome-autogen.sh
b/macros2/gnome-autogen.sh
index
960046f
..
63cae99
100644
(file)
--- a/
macros2/gnome-autogen.sh
+++ b/
macros2/gnome-autogen.sh
@@
-485,7
+485,7
@@
for configure_ac in $configure_files; do
cp -pf INSTALL INSTALL.autogen_bak
fi
if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then
- $AUTOMAKE --gnu --add-missing --
force --
copy -Wno-portability || exit 1
+ $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1
else
$AUTOMAKE --gnu --add-missing --copy || exit 1
fi