diff options
| author | Zack Weinberg <zack@codesourcery.com> | 2005-03-22 03:49:18 +0300 |
|---|---|---|
| committer | Zack Weinberg <zack@codesourcery.com> | 2005-03-22 03:49:18 +0300 |
| commit | 9e6daff153e91439bd05d763c0011cd5efdceb91 (patch) | |
| tree | a21024a87cc730ea3a9e0e64e66fb893146aa189 /config/gxx-include-dir.m4 | |
| parent | d4eb89201886c2a3b5505d829402e69ed6cfb0b3 (diff) | |
top:
* Makefile.def: Remove libstdcxx_incdir, libsubdir, gxx_include_dir,
gcc_version, and gcc_version_trigger from set of flags to pass.
* Makefile.tpl: Remove definitions of above variables.
(config.status): Remove dependency on $(gcc_version_trigger).
* Makefile.in: Regenerate.
* configure.in: Do not reference config/gcc-version.m4 nor
config/gxx-include-dir.m4. Do not invoke TL_AC_GCC_VERSION nor
TL_AC_GXX_INCLUDE_DIR. Do not set gcc_version_trigger.
* configure: Regenerate.
config:
* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
Diffstat (limited to 'config/gxx-include-dir.m4')
| -rw-r--r-- | config/gxx-include-dir.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4 index 87a65adaa..0e6e4ffc3 100644 --- a/config/gxx-include-dir.m4 +++ b/config/gxx-include-dir.m4 @@ -14,10 +14,10 @@ case "${with_gxx_include_dir}" in ;; no | "") case "${enable_version_specific_runtime_libs}" in - yes) gxx_include_dir='${libsubdir}/include/c++' ;; + yes) gxx_include_dir='$(libsubdir)/include/c++' ;; *) - libstdcxx_incdir=c++/${gcc_version} - gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;; + libstdcxx_incdir='c++/$(gcc_version)' + gxx_include_dir='$(prefix)/include/$(libstdcxx_incdir)' ;; esac ;; *) gxx_include_dir=${with_gxx_include_dir} ;; esac |