summaryrefslogtreecommitdiff
path: root/libjava/external/Makefile.am
diff options
context:
space:
mode:
authorzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-21 18:12:32 +0000
committerzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-21 18:12:32 +0000
commitdbff38f9ca9b48a7462feade10bc000d510206ae (patch)
treeb529223225cfa13fe07018548450763b2a152593 /libjava/external/Makefile.am
parent7d0f7bf8796f6f2af3eb54c527ac5714fe193883 (diff)
downloadgcc-dbff38f9ca9b48a7462feade10bc000d510206ae.tar.gz
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/external/Makefile.am')
-rw-r--r--libjava/external/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/libjava/external/Makefile.am b/libjava/external/Makefile.am
index 1f9b1753b20..0031d6b7b00 100644
--- a/libjava/external/Makefile.am
+++ b/libjava/external/Makefile.am
@@ -1,5 +1,8 @@
## Input file for automake to generate the Makefile.in used by configure
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+
SUBDIRS = sax w3c_dom
# Work around what appears to be a GNU make bug handling MAKEFLAGS