aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2002-02-23 10:08:09 +0000
committerAlexandre Oliva <aoliva@redhat.com>2002-02-23 10:08:09 +0000
commitf981596fcb98c7c38ba7248b8baf1373a021e7f6 (patch)
tree8c8a90d466bc8777a63a1a838bf296b49e9c1322
parent083abe54283b1c247e746f06849f7995abb236c4 (diff)
downloadnewlib-f981596fcb98c7c38ba7248b8baf1373a021e7f6.zip
newlib-f981596fcb98c7c38ba7248b8baf1373a021e7f6.tar.gz
newlib-f981596fcb98c7c38ba7248b8baf1373a021e7f6.tar.bz2
* Makefile.in (MAKEINFO): Don't assume makeinfo will be built just
because its Makefile is there; test for the executable instead.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b9df8cb..94a5828 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-09 Alexandre Oliva <aoliva@redhat.com>
Contribute sh64-elf.
diff --git a/Makefile.in b/Makefile.in
index 1a1494c..7bf5b5a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,7 +143,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; \