diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-21 18:12:32 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-21 18:12:32 +0000 |
| commit | dbff38f9ca9b48a7462feade10bc000d510206ae (patch) | |
| tree | b529223225cfa13fe07018548450763b2a152593 /libjava/include/Makefile.am | |
| parent | 7d0f7bf8796f6f2af3eb54c527ac5714fe193883 (diff) | |
| download | ppe42-gcc-dbff38f9ca9b48a7462feade10bc000d510206ae.tar.gz ppe42-gcc-dbff38f9ca9b48a7462feade10bc000d510206ae.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96825 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/include/Makefile.am')
| -rw-r--r-- | libjava/include/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libjava/include/Makefile.am b/libjava/include/Makefile.am index 089884b5fbd..f2553114cdc 100644 --- a/libjava/include/Makefile.am +++ b/libjava/include/Makefile.am @@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign +# May be used by various substitution variables. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ +tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include tool_include__HEADERS = jni.h jawt.h jawt_md.h jvmpi.h |
