Makefile.in (INSTALL_TARGET): Do install-gcc first.

        * Makefile.in (INSTALL_TARGET): Do install-gcc first.
        * configure (gxx_include_dir): Provide a definition for subdirs
        which do not use autoconf.

From-SVN: r16784

3 files changed, 17 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 50bcf7e..0732386 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 27 01:31:30 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (INSTALL_TARGET): Do install-gcc first.
+	* configure (gxx_include_dir): Provide a definition for subdirs
+	which do not use autoconf.
+
 Fri Nov 21 09:51:01 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* config.guess (alpha stuff): Merge with FSF to avoid incorrect
diff --git a/Makefile.in b/Makefile.in
index 2595c1c..fccbb0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -175,10 +175,10 @@ REALLY_SET_LIB_PATH = \
 
 ALL = all.normal
 INSTALL_TARGET = installdirs \
+	install-gcc \
 	$(INSTALL_MODULES) \
 	$(INSTALL_TARGET_MODULES) \
 	$(INSTALL_X11_MODULES) \
-	install-gcc \
 	$(INSTALL_DOSREL)
 
 
diff --git a/configure b/configure
index d8b8087..dd9ed1d 100755
--- a/configure
+++ b/configure
@@ -81,7 +81,7 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.1.1.1 $"
+version="$Revision: 1.2 $"
 x11=default
 
 ### we might need to use some other shell than /bin/sh for running subshells
@@ -1171,6 +1171,15 @@ EOF
                 echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
             fi 
 
+	    # provide a proper gxx_include_dir to all subdirs.
+	    # Note, if you change the default, make sure to fix both here
+	    # and in the gcc subdirectory.
+	    if test -z "${gxx_include_dir}"; then
+		echo gxx_include_dir = '${prefix}/include/g++' >> ${Makefile}
+	    else
+		echo gxx_include_dir = ${gxx_include_dir} >> ${Makefile}
+	    fi
+
             # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
             # remove any form feeds.
             if [ -z "${subdirs}" ]; then