[toplevel] libstdcxx_incdir not substituted

[toplevel] libstdcxx_incdir not substituted

[Andreas Schwab]

The default value of gxx_include_dir is
${prefix}/include/${libstdcxx_incdir}, but libstdcxx_incdir is never set,
although passed down to sub-makes.

Andreas.

2002-12-18  Andreas Schwab  <schwab@suse.de>

	* Makefile.tpl, configure.in: Substitute libstdcxx_incdir.
	* Makefile.in: Regenerate.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.132
diff -u -p -a -u -p -a -r1.132 Makefile.in
--- Makefile.in	18 Dec 2002 05:28:41 -0000	1.132
+++ Makefile.in	18 Dec 2002 12:26:50 -0000
@@ -69,7 +69,8 @@ includedir = @includedir@
 oldincludedir = @oldincludedir@
 infodir = @infodir@
 mandir = @mandir@
-gxx_include_dir=@gxx_include_dir@
+gxx_include_dir = @gxx_include_dir@
+libstdcxx_incdir = @libstdcxx_incdir@
 
 tooldir = @tooldir@
 build_tooldir = @build_tooldir@
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.193
diff -u -p -a -u -p -a -r1.193 configure.in
--- configure.in	17 Dec 2002 04:32:25 -0000	1.193
+++ configure.in	18 Dec 2002 12:27:34 -0000
@@ -1731,6 +1731,7 @@ s%@target_subdir@%${target_subdir}%
 s%@build_subdir@%${build_subdir}%
 s%@build_configargs@%${buildargs}%
 s%@gxx_include_dir@%${gxx_include_dir}%
+s%@libstdcxx_incdir@%${libstdcxx_incdir}%
 s%@host_configargs@%${hostargs}%
 EOF
 sed -f $sedtemp Makefile > Makefile.tem

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [toplevel] libstdcxx_incdir not substituted

[DJ Delorie]

> 2002-12-18  Andreas Schwab  <schwab@suse.de>
> 
> 	* Makefile.tpl, configure.in: Substitute libstdcxx_incdir.
> 	* Makefile.in: Regenerate.

This is fine, please apply to both gcc and src.