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: r16783

diff --git a/ChangeLog b/ChangeLog
index ed9fed85027cf04629a1a4620ecf9e94177517c3..f81e867079ba0eeb79f442f49e35e9f3e149043f 100644 (file)
--- 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.
+       
 Wed Nov 26 16:08:50 1997  Jeffrey A Law  (law@cygnus.com)
 
        * From Franz Sirl.

diff --git a/Makefile.in b/Makefile.in
index 2595c1c7fa6f2c871bd5c015f4a2cb7aabc3c72c..fccbb0ec91c70d7e7b6e390c05c9df88e5bf6c09 100644 (file)
--- 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 d8b8087be284620c66689ef7af73313007006692..dd9ed1d20b38a40b277ce3315ab3aab06df70ad4 100755 (executable)
--- 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