2000-12-10 Alexandre Petit-Bianco <apbianco@cygnus.com>

	* src/Makefile.am (libstdc++.INC:): 2000-12-05 reverted to include
	2000-11-12 hunk.
	* src/Makefile.in: Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38178 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ffab043..578402d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-10  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * src/Makefile.am (libstdc++.INC:): 2000-12-05 reverted to include
+       2000-11-12 hunk.
+       * src/Makefile.in: Rebuilt.
+
 2000-12-09  Jason Merrill  <jason@redhat.com>
 
        * testsuite/20_util/auto_ptr.cc (test07): Remove test that tries

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 9c4e346..0f86e26 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-## $Id: Makefile.am,v 1.55 2000/11/30 23:44:32 gdr Exp $
+## $Id: Makefile.am,v 1.56 2000/12/06 03:05:12 bkoz Exp $
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -326,7 +326,7 @@ libstdc++.INC: Makefile
        mv tmp-$@ $@
 
 tmp-libstdc++.INC: Makefile
-       echo -I$(top_builddir) $(INCLUDES) > $@
+       echo $(INCLUDES) > $@
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index f2e35fc..5105ed9 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -688,7 +688,7 @@ libstdc++.INC: Makefile
        mv tmp-$@ $@
 
 tmp-libstdc++.INC: Makefile
-       echo -I$(top_builddir) $(INCLUDES) > $@
+       echo $(INCLUDES) > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.