[PATCH 3.2/3.3/HEAD] Propagate gxx_include_dir to the libstdc++ subdirectory

[Matthias Klose]

If gxx_include_dir is passed from the toplevel Makefile for
i.e. installation in a staging area, the value is not passed down to
the libstdc++-v3/libsup++ directory. Instead in libstdc++-v3/libsup++
the value defined at configure time is used.

This patch passes down the value to libsupc++ and expresses
glibcppinstalldir in terms of gxx_include_dir in libsupc++.

Although we now how DESTDIR support, I would like to checkin this
patch on HEAD and 3.2 / 3.3 branches.

Checked with an installation with and without passing gxx_include_dir
from the toplevel directory.

Ok to checkin?

	Matthias

2003-02-26  Matthias Klose  <doko@debian.org>

	* Makefile.am (AM_MAKEFLAGS): Also pass gxx_include_dir.
	FLAGS_TO_PASS: Set to AM_MAKEFLAGS
	* Makefile.in: Regenerate.
	* libsupc++/Makefile.am: Express glibcppinstalldir in terms
	of gxx_include_dir.
	AM_MAKEFLAGS: Pass gxx_include_dir.
	* libsupc++/Makefile.in: Regenerate.


--- ./libstdc++-v3/Makefile.am~	Sat Mar  2 00:42:59 2002
+++ ./libstdc++-v3/Makefile.am	Sun Apr 28 16:59:02 2002
@@ -134,6 +134,7 @@
 	"includedir=$(includedir)" \
 	"prefix=$(prefix)" \
 	"tooldir=$(tooldir)" \
+	"gxx_include_dir=$(gxx_include_dir)" \
 	"AR=$(AR)" \
 	"AS=$(AS)" \
 	"LD=$(LD)" \
@@ -145,3 +145,5 @@
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
 	"DESTDIR=$(DESTDIR)" \
 	"WERROR=$(WERROR)" 
+
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
--- ./libstdc++-v3/libsupc++/Makefile.am~	Tue Apr  2 00:09:33 2002
+++ ./libstdc++-v3/libsupc++/Makefile.am	Mon Apr 29 00:55:16 2002
@@ -95,7 +95,7 @@
 libsupc___la_SOURCES = $(sources)
 libsupc__convenience_la_SOURCES = $(sources)
 
-glibcppinstalldir = @gxx_include_dir@
+glibcppinstalldir = $(gxx_include_dir)
 glibcppinstall_HEADERS = $(headers)
 
 LIBSUPCXX_CXXFLAGS = $(LIBSUPCXX_PICFLAGS)
@@ -133,6 +133,9 @@
 	$(WARN_CXXFLAGS) \
 	$(OPTIMIZE_CXXFLAGS) \
 	$(CONFIG_CXXFLAGS) 
+
+AM_MAKEFLAGS = \
+	"gxx_include_dir=$(gxx_include_dir)"
 
 # libstdc++ libtool notes