3 files changed, 241 insertions, 208 deletions
diff --git a/util/crossgcc/patches/binutils-2.37_no-makeinfo.patch b/util/crossgcc/patches/binutils-2.37_no-makeinfo.patch
deleted file mode 100644
index ed762a1e90..0000000000
--- a/util/crossgcc/patches/binutils-2.37_no-makeinfo.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 9b3a5d75..b8347953 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -370,7 +370,7 @@ YACC = @YACC@
- FLEX = @FLEX@
- LEX = @LEX@
- M4 = @M4@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- EXPECT = @EXPECT@
- RUNTEST = @RUNTEST@
- 
-diff --git a/Makefile.tpl b/Makefile.tpl
-index 84fee3dd..79a3ea7a 100644
---- a/Makefile.tpl
-+++ b/Makefile.tpl
-@@ -373,7 +373,7 @@ YACC = @YACC@
- FLEX = @FLEX@
- LEX = @LEX@
- M4 = @M4@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- EXPECT = @EXPECT@
- RUNTEST = @RUNTEST@
- 
-diff --git a/bfd/Makefile.in b/bfd/Makefile.in
-index 12807d99..c42976cb 100644
---- a/bfd/Makefile.in
-+++ b/bfd/Makefile.in
-@@ -343,7 +343,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
-index 0724b778..ff6cf159 100644
---- a/bfd/doc/Makefile.in
-+++ b/bfd/doc/Makefile.in
-@@ -285,7 +285,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-diff --git a/binutils/Makefile.in b/binutils/Makefile.in
-index bed8fef6..4066d24f 100644
---- a/binutils/Makefile.in
-+++ b/binutils/Makefile.in
-@@ -469,7 +469,7 @@ LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
-index 024a642e..c66d21de 100644
---- a/binutils/doc/Makefile.in
-+++ b/binutils/doc/Makefile.in
-@@ -302,7 +302,7 @@ LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-diff --git a/gas/Makefile.in b/gas/Makefile.in
-index f3d66b8e..5a53a9cb 100644
---- a/gas/Makefile.in
-+++ b/gas/Makefile.in
-@@ -319,7 +319,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
-index 89d2ca06..d98a8883 100644
---- a/gas/doc/Makefile.in
-+++ b/gas/doc/Makefile.in
-@@ -281,7 +281,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-diff --git a/gold/Makefile.in b/gold/Makefile.in
-index 9fd21214..52e5f365 100644
---- a/gold/Makefile.in
-+++ b/gold/Makefile.in
-@@ -558,7 +558,7 @@ LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MERGE_CONSTANTS_FLAG = @MERGE_CONSTANTS_FLAG@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
-index 7b4b7832..090a555f 100644
---- a/gold/testsuite/Makefile.in
-+++ b/gold/testsuite/Makefile.in
-@@ -2644,7 +2644,7 @@ LIBS = @LIBS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MERGE_CONSTANTS_FLAG = @MERGE_CONSTANTS_FLAG@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-diff --git a/gprof/Makefile.in b/gprof/Makefile.in
-index 0f766a36..b8c07e2b 100644
---- a/gprof/Makefile.in
-+++ b/gprof/Makefile.in
-@@ -351,7 +351,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index ef2e99e0..9775d3d2 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -428,7 +428,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-diff --git a/libctf/Makefile.in b/libctf/Makefile.in
-index 5cfa100f..8b3bf7ab 100644
---- a/libctf/Makefile.in
-+++ b/libctf/Makefile.in
-@@ -360,7 +360,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- NM = @NM@
- NMEDIT = @NMEDIT@
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index d19e14a2..6b1dd3d7 100644
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -56,7 +56,7 @@ CC = @CC@
- CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- RANLIB = @RANLIB@ @RANLIB_PLUGIN_OPTION@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- PERL = @PERL@
- 
- PICFLAG = @PICFLAG@
-diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
-index 42c15f00..82b8dc9a 100644
---- a/opcodes/Makefile.in
-+++ b/opcodes/Makefile.in
-@@ -323,7 +323,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
-diff --git a/zlib/Makefile.in b/zlib/Makefile.in
-index 062dc04e..4abb5cee 100644
---- a/zlib/Makefile.in
-+++ b/zlib/Makefile.in
-@@ -304,7 +304,7 @@ LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = true
- MKDIR_P = @MKDIR_P@
- NM = @NM@
- NMEDIT = @NMEDIT@
diff --git a/util/crossgcc/patches/binutils-2.37_as-ipxe.patch b/util/crossgcc/patches/binutils-2.40_as-ipxe.patch
index 4d2c00a17f..4d2c00a17f 100644
--- a/util/crossgcc/patches/binutils-2.37_as-ipxe.patch
+++ b/util/crossgcc/patches/binutils-2.40_as-ipxe.patch
diff --git a/util/crossgcc/patches/binutils-2.40_no-makeinfo.patch b/util/crossgcc/patches/binutils-2.40_no-makeinfo.patch
new file mode 100644
index 0000000000..e37073fdd4
--- /dev/null
+++ b/util/crossgcc/patches/binutils-2.40_no-makeinfo.patch
@@ -0,0 +1,241 @@
+It fails to compile when using "MAKEINFO = @MAKEINFO@":
+binutils-gdb/missing: 81: makeinfo: not found
+WARNING: 'makeinfo' is missing on your system.
+         You should only need it if you modified a '.texi' file, or
+         any other file indirectly affecting the aspect of the manual.
+         You might want to install the Texinfo package:
+         <http://www.gnu.org/software/texinfo/>
+         The spurious makeinfo call might also be the consequence of
+         using a buggy 'make' (AIX, DU, IRIX), in which case you might
+         want to install GNU make:
+         <http://www.gnu.org/software/make/>
+make[4]: *** [Makefile:507: as.info] Error 127
+Current patch will change that to "MAKEINFO = true"
+diff -ur binutils-2.40.orig/bfd/Makefile.in binutils-2.40/bfd/Makefile.in
+--- binutils-2.40.orig/bfd/Makefile.in	2022-08-05 11:53:59.000000000 +0200
++++ binutils-2.40/bfd/Makefile.in	2022-08-20 05:46:39.960039957 +0200
+@@ -379,7 +379,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+diff -ur binutils-2.40.orig/binutils/Makefile.in binutils-2.40/binutils/Makefile.in
+--- binutils-2.40.orig/binutils/Makefile.in	2022-08-05 11:56:21.000000000 +0200
++++ binutils-2.40/binutils/Makefile.in	2022-08-20 05:46:38.563035937 +0200
+@@ -532,7 +532,7 @@
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+diff -ur binutils-2.40.orig/etc/Makefile.in binutils-2.40/etc/Makefile.in
+--- binutils-2.40.orig/etc/Makefile.in	2022-07-08 11:46:47.000000000 +0200
++++ binutils-2.40/etc/Makefile.in	2022-08-20 05:46:38.525035827 +0200
+@@ -154,7 +154,7 @@
+ LIBS = @LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+diff -ur binutils-2.40.orig/gas/Makefile.in binutils-2.40/gas/Makefile.in
+--- binutils-2.40.orig/gas/Makefile.in	2022-08-05 11:55:17.000000000 +0200
++++ binutils-2.40/gas/Makefile.in	2022-08-20 05:46:38.535035856 +0200
+@@ -408,7 +408,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+diff -ur binutils-2.40.orig/gold/Makefile.in binutils-2.40/gold/Makefile.in
+--- binutils-2.40.orig/gold/Makefile.in	2022-07-08 11:58:08.000000000 +0200
++++ binutils-2.40/gold/Makefile.in	2022-08-20 05:46:38.522035819 +0200
+@@ -558,7 +558,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MERGE_CONSTANTS_FLAG = @MERGE_CONSTANTS_FLAG@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+diff -ur binutils-2.40.orig/gold/testsuite/Makefile.in binutils-2.40/gold/testsuite/Makefile.in
+--- binutils-2.40.orig/gold/testsuite/Makefile.in	2022-07-08 11:58:08.000000000 +0200
++++ binutils-2.40/gold/testsuite/Makefile.in	2022-08-20 05:46:38.524035824 +0200
+@@ -2644,7 +2644,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MERGE_CONSTANTS_FLAG = @MERGE_CONSTANTS_FLAG@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+diff -ur binutils-2.40.orig/gprof/Makefile.in binutils-2.40/gprof/Makefile.in
+--- binutils-2.40.orig/gprof/Makefile.in	2022-08-05 11:59:11.000000000 +0200
++++ binutils-2.40/gprof/Makefile.in	2022-08-20 05:46:39.964039969 +0200
+@@ -351,7 +351,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+diff -ur binutils-2.40.orig/gprofng/doc/Makefile.in binutils-2.40/gprofng/doc/Makefile.in
+--- binutils-2.40.orig/gprofng/doc/Makefile.in	2022-08-05 11:59:31.000000000 +0200
++++ binutils-2.40/gprofng/doc/Makefile.in	2022-08-20 05:46:39.252037920 +0200
+@@ -271,7 +271,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+diff -ur binutils-2.40.orig/gprofng/gp-display-html/Makefile.in binutils-2.40/gprofng/gp-display-html/Makefile.in
+--- binutils-2.40.orig/gprofng/gp-display-html/Makefile.in	2022-08-05 11:59:33.000000000 +0200
++++ binutils-2.40/gprofng/gp-display-html/Makefile.in	2022-08-20 05:46:39.479038573 +0200
+@@ -234,7 +234,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+diff -ur binutils-2.40.orig/gprofng/libcollector/Makefile.in binutils-2.40/gprofng/libcollector/Makefile.in
+--- binutils-2.40.orig/gprofng/libcollector/Makefile.in	2022-08-05 11:59:38.000000000 +0200
++++ binutils-2.40/gprofng/libcollector/Makefile.in	2022-08-20 05:46:38.965037094 +0200
+@@ -341,7 +341,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+diff -ur binutils-2.40.orig/gprofng/Makefile.in binutils-2.40/gprofng/Makefile.in
+--- binutils-2.40.orig/gprofng/Makefile.in	2022-08-05 11:59:30.000000000 +0200
++++ binutils-2.40/gprofng/Makefile.in	2022-08-20 05:46:38.574035968 +0200
+@@ -289,7 +289,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+diff -ur binutils-2.40.orig/gprofng/src/Makefile.in binutils-2.40/gprofng/src/Makefile.in
+--- binutils-2.40.orig/gprofng/src/Makefile.in	2022-08-05 11:59:34.000000000 +0200
++++ binutils-2.40/gprofng/src/Makefile.in	2022-08-20 05:46:38.573035965 +0200
+@@ -358,7 +358,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+diff -ur binutils-2.40.orig/ld/Makefile.in binutils-2.40/ld/Makefile.in
+--- binutils-2.40.orig/ld/Makefile.in	2022-08-05 11:56:53.000000000 +0200
++++ binutils-2.40/ld/Makefile.in	2022-08-20 05:46:38.536035859 +0200
+@@ -432,7 +432,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+diff -ur binutils-2.40.orig/libctf/Makefile.in binutils-2.40/libctf/Makefile.in
+--- binutils-2.40.orig/libctf/Makefile.in	2022-07-08 12:02:15.000000000 +0200
++++ binutils-2.40/libctf/Makefile.in	2022-08-20 05:46:39.771039414 +0200
+@@ -425,7 +425,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+diff -ur binutils-2.40.orig/libiberty/Makefile.in binutils-2.40/libiberty/Makefile.in
+--- binutils-2.40.orig/libiberty/Makefile.in	2022-07-08 11:46:48.000000000 +0200
++++ binutils-2.40/libiberty/Makefile.in	2022-08-20 05:46:39.961039960 +0200
+@@ -57,7 +57,7 @@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+ RANLIB = @RANLIB@ @RANLIB_PLUGIN_OPTION@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ PERL = @PERL@
+ 
+ PICFLAG = @PICFLAG@
+diff -ur binutils-2.40.orig/Makefile.in binutils-2.40/Makefile.in
+--- binutils-2.40.orig/Makefile.in	2022-08-05 13:00:56.000000000 +0200
++++ binutils-2.40/Makefile.in	2022-08-20 05:46:38.549035896 +0200
+@@ -399,7 +399,7 @@
+ FLEX = @FLEX@
+ LEX = @LEX@
+ M4 = @M4@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ EXPECT = @EXPECT@
+ RUNTEST = @RUNTEST@
+ 
+diff -ur binutils-2.40.orig/Makefile.tpl binutils-2.40/Makefile.tpl
+--- binutils-2.40.orig/Makefile.tpl	2022-07-08 11:46:47.000000000 +0200
++++ binutils-2.40/Makefile.tpl	2022-08-20 05:46:38.535035856 +0200
+@@ -402,7 +402,7 @@
+ FLEX = @FLEX@
+ LEX = @LEX@
+ M4 = @M4@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ EXPECT = @EXPECT@
+ RUNTEST = @RUNTEST@
+ 
+diff -ur binutils-2.40.orig/opcodes/Makefile.in binutils-2.40/opcodes/Makefile.in
+--- binutils-2.40.orig/opcodes/Makefile.in	2022-08-05 11:54:59.000000000 +0200
++++ binutils-2.40/opcodes/Makefile.in	2022-08-20 05:46:38.522035819 +0200
+@@ -324,7 +324,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+diff -ur binutils-2.40.orig/zlib/Makefile.in binutils-2.40/zlib/Makefile.in
+--- binutils-2.40.orig/zlib/Makefile.in	2022-07-08 11:56:28.000000000 +0200
++++ binutils-2.40/zlib/Makefile.in	2022-08-20 05:46:38.571035960 +0200
+@@ -321,7 +321,7 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = true
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@