aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2002-02-23 10:06:59 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2002-02-23 10:06:59 +0000
commit0210b33b54f8a1581d2aec1ac36ee2947bd7600b (patch)
treec9a5699648c7b05109a8f2b52ea9efd095e2b253
parent44c5edc005283d132f655130527e7eb08ededf51 (diff)
downloadgcc-0210b33b54f8a1581d2aec1ac36ee2947bd7600b.zip
gcc-0210b33b54f8a1581d2aec1ac36ee2947bd7600b.tar.gz
gcc-0210b33b54f8a1581d2aec1ac36ee2947bd7600b.tar.bz2
Makefile.in (MAKEINFO): Don't assume makeinfo will be built just because its Makefile is there...
* Makefile.in (MAKEINFO): Don't assume makeinfo will be built just because its Makefile is there; test for the executable instead. From-SVN: r49990
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b1fea4..9de6dc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-23 Alexandre Oliva <aoliva@redhat.com>
+
+ * Makefile.in (MAKEINFO): Don't assume makeinfo will be built just
+ because its Makefile is there; test for the executable instead.
+
2002-02-22 Alexandre Oliva <aoliva@redhat.com>
* configure.in (CXX_FOR_TARGET): Add -shared-libgcc for
diff --git a/Makefile.in b/Makefile.in
index 4e865c8..d8c5c59 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -142,7 +142,7 @@ M4 = `if [ -f $$r/m4/m4 ] ; \
# For an installed makeinfo, we require it to be from texinfo 4 or
# higher, else we use the "missing" dummy.
-MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
+MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
then echo $$r/texinfo/makeinfo/makeinfo ; \
else if (makeinfo --version \
| egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \