temporary mid-attempt at fixincludes during three-stage

diff --git a/Makefile.in b/Makefile.in
index e6535acf21ce4b0cd292665aea4e1b0480605f7f..509791aea008ae99daa285dadb752dfb4a8d79c7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #
-# Last Mod Wed Nov 13 23:26:23 PST 1991, by rich@cygnus.com
+# Last Mod Thu Nov 14 03:17:05 PST 1991, by rich@cygnus.com
 #
 # $Id$
 
@@ -54,10 +54,21 @@ INSTALL_FIXED_INCLUDES = install-fixed-includes
 ###
 
 all:   $(ALL)
+all-info: force
+       $(MAKE) subdir_do DO=all-info "DODIRS=$(SUBDIRS)"
+
+install-info: dir.info install-info-dirs force
+       $(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)"
+       $(MAKE) install-dir.info
 
 all.normal:
        $(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)"
 
+./fixed-includes:
+       if [ -d ./fixed-includes ] ; then rm -rf ./fixed-includes ; else true ; fi
+       mkdir ./fixed-includes
+       $(srcdir)/gcc/fixincludes `pwd`/fixed-includes
+
 # this is a bad hack.
 all.xclib:     all.normal
        if [ -d clib ] ; then \
@@ -92,31 +103,29 @@ subdir_do: force
        fi ; \
        done
 
-
-
-bootstrap:
-       $(MAKE) all
+bootstrap: ./fixed-includes
+       $(MAKE) all all-info
        $(MAKE) stage1
        $(MAKE) pass "stagepass=stage1"
        $(MAKE) stage2
        $(MAKE) pass "stagepass=stage2"
        $(MAKE) comparison
 
-bootstrap2:
+bootstrap2: ./fixed-includes
        $(MAKE) pass "stagepass=stage1"
        $(MAKE) stage2
        $(MAKE) pass "stagepass=stage2"
        $(MAKE) comparison
 
-bootstrap3:
+bootstrap3: ./fixed-includes
        $(MAKE) pass "stagepass=stage2"
        $(MAKE) comparison
 
-pass:
+pass: ./fixed-includes
        cp $(srcdir)/gcc/gstdarg.h $(unsubdir)/gas$(subdir)/stdarg.h
-       $(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS)" \
+       $(MAKE) subdir_do "DO=all all-info" "DODIRS=$(SUBDIRS)" \
                "CC=`pwd`/$(unsubdir)/gcc$(subdir)/$(stagepass)/gcc \
-               -O $(GCCVERBOSE) \
+               -O $(GCCVERBOSE) -I`pwd`/fixed-includes \
                -B`pwd`/$(unsubdir)/gcc$(subdir)/$(stagepass)/ \
                -B`pwd`/$(unsubdir)/gas$(subdir)/$(stagepass)/ \
                -B`pwd`/$(unsubdir)/ld$(subdir)/$(stagepass)/" \
@@ -129,16 +138,16 @@ pass:
                -B`pwd`/$(unsubdir)/ld$(subdir)/$(stagepass)/"
 
 
-stage1:
+stage1: ./fixed-includes
        $(MAKE) subdir_do DO=stage1 "DODIRS=$(SUBDIRS)"
 
-stage2:
+stage2: ./fixed-includes
        $(MAKE) subdir_do DO=stage2 "DODIRS=$(SUBDIRS)"
 
-stage3:
+stage3: ./fixed-includes
        $(MAKE) subdir_do DO=stage3 "DODIRS=$(SUBDIRS)"
 
-stage4:
+stage4: ./fixed-includes
        $(MAKE) subdir_do DO=stage4 "DODIRS=$(SUBDIRS)"
 
 against=stage2
@@ -171,7 +180,6 @@ MAKEDIRS= \
        $(ddestdir)/lib/emacs \
        $(idestdir) \
        $(idestdir)/lib \
-       $(idestdir)/info \
        $(idestdir)/doc \
        $(idestdir)/man \
        $(idestdir)/man/man1 \
@@ -183,6 +191,16 @@ install-dirs: force
                if [ -d $$i ] ; then true ; else mkdir $$i ; fi ; \
        done
 
+MAKEINFODIRS= \
+       $(idestdir) \
+       $(idestdir)/info
+
+install-info-dirs: force
+       for i in $(MAKEINFODIRS) ; do \
+               echo Making $$i... ; \
+               if [ -d $$i ] ; then true ; else mkdir $$i ; fi ; \
+       done
+
 install-headers:
        if [ -d $(unsubdir)/gcc$(subdir) ] ; then \
                (cd  $(unsubdir)/gcc$(subdir) ; \
@@ -197,18 +215,15 @@ install-fixed-includes: force
        else true; \
        fi
 
+install-dir.info-in-place: force
+       rdir=`cd $(srcdir)/texinfo ; pwd` \
+       && cd $(idestdir)/info \
+       && ($${rdir}/gen-info-dir `pwd`) > dir
+
 dir.info: force
-       gen-info-dir . > dir.info.new
+       $(srcdir)/texinfo/gen-info-dir . > dir.info.new
        mv -f dir.info.new dir.info
 
-generate-dir: force
-       - rm -f menus
-       for i in `find . -name \*.info -print` ; do \
-               echo Frobbing $$i... ; \
-               sed -e '1,/START-INFO-DIR-ENTRY/d' \
-                       -e '/END-INFO-DIR-ENTRY/,$$d' $$i >> menus ; \
-       done
-
 etags tags: TAGS
 
 TAGS: FORCE