From: Jeffrey A Law <law@cygnus.com>
Date: Thu, 27 Nov 1997 08:35:31 +0000 (+0000)
Subject: Makefile.in (INSTALL_TARGET): Do install-gcc first.
X-Git-Tag: releases/egcs-1.0.0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=723ee92c8bcf5a67b3771336ad90e829d6b9f28b;p=thirdparty%2Fgcc.git

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 ed9fed85027c..f81e867079ba 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.
+	
 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 2595c1c7fa6f..fccbb0ec91c7 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 d8b8087be284..dd9ed1d20b38 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