* Makefile.in (MAKEINFO): Use makeinfo built from sibling

        tree when available.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@25533 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86d209f..57b03e4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar  2 09:37:05 1999  Robert Lipe  <robertlipe@usa.net>
+
+       * Makefile.in (MAKEINFO): Use makeinfo built from sibling
+       tree when available.
+
 Tue Mar  2 10:12:48 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * alpha.c (alpha_cpu_name, alpha_cpu_string, alpha_tp_string,

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 9a96eb3..5691c49 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -99,7 +99,9 @@ LN_S=@LN_S@
 # These permit overriding just for certain files.
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-MAKEINFO = makeinfo
+MAKEINFO = `if [ -f $(objdir)/../texinfo/makeinfo/Makefile ] ; \
+       then echo $(objdir)/../texinfo/makeinfo/makeinfo ; \
+       else echo makeinfo ; fi`
 MAKEINFOFLAGS =
 TEXI2DVI = texi2dvi
 # For GNUmake: let us decide what gets passed to recursive makes.