* Makefile.in: For libg++, make sure the -I pointing

	to the gcc directory goes *after* all the libg++-local -I flags.
	Also, move just-gcc dependency from just-libg++ to all-libg++.

diff --git a/ChangeLog b/ChangeLog
index 4b22884120a153ee6cd2946891e12bae528fd41c..a18222e092288e06b75675a4dcb35a480dedb5ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Tue Jan 28 23:51:07 1992  Per Bothner  (bothner at cygnus.com)
+
+       * Makefile.in:  For libg++, make sure the -I pointing
+       to the gcc directory goes *after* all the libg++-local -I flags.
+       Also, move just-gcc dependency from just-libg++ to all-libg++.
+
+Tue Jan 28 12:56:24 1992  Stu Grossman  (grossman at cygnus.com)
+
+       * configure:  Change -x to -f to keep Ultrix /bin/test happy.
+
+Sat Jan 18 17:45:11 1992  Stu Grossman  (grossman at cygnus.com)
+
+       * Makefile.in (make-gdb.tar.Z):  Remove texinfo targets.
+
 Sat Jan 18 17:03:21 1992  Fred Fish  (fnf at cygnus.com)
 
        * config.sub:  Add stratus configuration frags.  Also 

diff --git a/Makefile.in b/Makefile.in
index a3075ee2744f4cce6b9cad3b3bcb590d0c93a6e2..8b6914885a375a3e1f9b4ad8adf506102285b868 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1233,6 +1233,8 @@ install-cvs: install-rcs install-gdbm force
        if [ -d $(unsubdir)/cvs ] ; then \
                (cd $(unsubdir)/cvs$(subdir); \
                $(MAKE) \
+                       "bindir=$(bindir)" \
+                       "mandir=$(man1dir)" \
                        "against=$(against)" \
                        "AR=$(AR)" \
                        "AR_FLAGS=$(AR_FLAGS)" \
@@ -1486,13 +1488,15 @@ install-fileutils: force
 
 ### libg++
 .PHONY: all-libg++ just-libg++
-all-libg++: just-libg++
-# NOTE!  We have added GXX= to the $(MAKE) line!!!  Do not clone this one.
-just-libg++: just-gcc force
+all-libg++: just-gcc just-libg++
+# NOTE!  We have added GXX= and XTRAFLAGS to the $(MAKE) line!!!
+# Do not clone this one.
+just-libg++: force
        if [ -d $(unsubdir)/libg++ ] ; then \
                (cd $(unsubdir)/libg++$(subdir); \
                $(MAKE) \
-                       GXX=`cd $(unsubdir)/..$(subdir); pwd`"/gcc/gcc -B"`cd $(unsubdir)/..$(subdir);pwd`"/gcc/ -I"`cd $(unsubdir)/..$(subdir); pwd`/gcc/include \
+                       GXX=`cd $(unsubdir)/..$(subdir); pwd`"/gcc/gcc -B"`cd $(unsubdir)/..$(subdir);pwd`"/gcc/" \
+                       "XTRAFLAGS=-I"`cd $(unsubdir)/..$(subdir); pwd`/gcc/include\
                        "prefix=$(prefix)" \
                        "datadir=$(datadir)" \
                        "mandir=$(mandir)" \
@@ -1744,6 +1748,12 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
        # Take out glob from buildable dirs
        rm proto-toplev/Makefile.in
        sed '/^SUBDIRS =/s/glob //' <Makefile.in >proto-toplev/Makefile.in
+       # Take out texinfo from buildable dirs
+       cp proto-toplev/Makefile.in temp.$$
+       sed '/^all\.normal: /s/all-texinfo //' <temp.$$ >temp1.$$
+       sed '/^clean: /s/clean-texinfo //' <temp1.$$ >temp.$$
+       sed '/^install\.all: /s/install-texinfo //' <temp.$$ >proto-toplev/Makefile.in
+       rm temp.$$ temp1.$$
        mkdir proto-toplev/texinfo
        mkdir proto-toplev/texinfo/fsf
        ln -s ../../../texinfo/fsf/texinfo.tex proto-toplev/texinfo/fsf/