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
This commit is contained in:
Zack Weinberg
2005-03-21 18:12:32 +00:00
parent 8eb1bc5cf5
commit e9bbd9d707
20 changed files with 230 additions and 239 deletions
+4
View File
@@ -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