It's useful to have genfixes fail when autogen is not found, especially
when genfixes is run as part of an automated build. That's also more
consistent with what happens if autogen is found, but the run fails for
some reason (set -e is in effect).
Setting $@ to fixincl.x when $# is 0 doesn't seem to have any purpose,
since $@ is not used afterwards. Remove that logic to not confuse a
reader.
There's no (longer) any autogen package at the gcc/infrastucture
URL. Update to the folder pointed to by the downloads link on
autogen's webpage.
2018-06-09 Rasmus Villemoes <rasmus.villem...@prevas.dk>
fixincludes/
* genfixes: exit 1 when autogen not found.
* genfixes: Remove some redundant code.
* genfixes: Update URL to autogen source code.
---
fixincludes/genfixes | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/fixincludes/genfixes b/fixincludes/genfixes
index f0fc5e64f8b..47aad01289d 100755
--- a/fixincludes/genfixes
+++ b/fixincludes/genfixes
@@ -55,19 +55,16 @@ do
esac
done
-if [ $# -eq 0 ] ; then
- set -- fixincl.x
-fi
-
AG="autogen $AG"
set -e
if [ -z "`${AG} -v | fgrep ' 5.'`" ]
then
echo "AutoGen appears to be out of date or not correctly installed."
- echo "Please download and install:"
- echo " ftp://gcc.gnu.org/pub/gcc/infrastructure/autogen.tar.gz";
+ echo "Please download and install from:"
+ echo " https://ftp.gnu.org/gnu/autogen/";
touch fixincl.x
+ exit 1
else
echo AutoGen-ing fixincl.x
$AG inclhack.def
--
2.15.1
