diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2005-03-21 18:12:32 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2005-03-21 18:12:32 +0000 |
| commit | e9bbd9d70730a74f0c43b36961897c23d3dbdce4 (patch) | |
| tree | b529223225cfa13fe07018548450763b2a152593 /config | |
| parent | 8eb1bc5cf58e5f5c3fa65bae9293afa6c2adf976 (diff) | |
| download | gcc-e9bbd9d70730a74f0c43b36961897c23d3dbdce4.zip gcc-e9bbd9d70730a74f0c43b36961897c23d3dbdce4.tar.gz gcc-e9bbd9d70730a74f0c43b36961897c23d3dbdce4.tar.bz2 | |
gxx-include-dir.m4: In all substitutions, leave $(gcc_version) to be expanded by the Makefile.
config:
* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
libjava:
* configure.ac: Do not invoke TL_AC_GCC_VERSION. Do not
set tool_include_dir. In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
* aclocal.m4, configure: Regenerate.
* Makefile.am: Set gcc_version. Replace all uses of
@gcc_version@ with $(gcc_version).
* external/Makefile.am, external/sax/Makefile.am
* external/w3c_dom/Makefile.am, gcj/Makefile.am
* testsuite/Makefile.am: Set gcc_version.
* include/Makefile.am: Set gcc_version and tool_include_dir.
* Makefile.in, external/Makefile.in, external/sax/Makefile.in
* external/w3c_dom/Makefile.in, gcj/Makefile.in, include/Makefile.in
* testsuite/Makefile.in: Regenerate.
From-SVN: r96825
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/gxx-include-dir.m4 | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 7d7dd7e..8572384 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2005-03-21 Zack Weinberg <zack@codesourcery.com> + + * gxx-include-dir.m4: In all substitutions, leave $(gcc_version) + to be expanded by the Makefile. + 2005-03-15 Zack Weinberg <zack@codesourcery.com> * gcc-version.m4: Delete. diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4 index 87a65ad..0e6e4ff 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 |