*** empty log message ***

[deliverable/binutils-gdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f7c38950f129f19e0d68ff858ecf642039ace9e2..400c875fcd5ab5553352ba68e57a9e50b1825b50 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1070,8 +1070,9 @@ info: do-info
 installcheck: do-installcheck
 dvi: do-dvi
 
-# Make sure makeinfo is built before we do a `make info'.
-do-info: all-texinfo
+# Make sure makeinfo is built before we do a `make info', if we're
+# in fact building texinfo.
+do-info: maybe-all-texinfo
 
 install-info: do-install-info dir.info
        s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7460,14 +7461,17 @@ gcc/Makefile: config.status
          $(HOST_CONFIGARGS) $${srcdiroption} \
          || exit 1
 
-# Don't remake gcc if it's already been made by 'bootstrap'; that causes
-# nothing but trouble.  This wart will be fixed eventually by moving
+# Don't 'make all' in gcc if it's already been made by 'bootstrap'; that
+# causes trouble.  This wart will be fixed eventually by moving
 # the bootstrap behavior to this file.
 .PHONY: all-gcc maybe-all-gcc
 maybe-all-gcc:
 all-gcc: configure-gcc
-       @if [ -f gcc/xgcc ] ; then \
-         exit 0 ; \
+       @if [ -f gcc/stage_last ] ; then \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
+         $(SET_LIB_PATH) \
+         (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
        else \
          r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
@@ -7612,7 +7616,7 @@ configure-gdb: maybe-configure-tcl maybe-configure-tk maybe-configure-sim
 GDB_TK = @GDB_TK@
 all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
 install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
-libgui/Makefile: maybe-configure-tcl maybe-configure-tk
+configure-libgui: maybe-configure-tcl maybe-configure-tk
 all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
 
 # Host modules specific to binutils.