PR rtl-optimization/48542

[pf3gnuchains/gcc-fork.git] / libjava / include / Makefile.am

diff --git a/libjava/include/Makefile.am b/libjava/include/Makefile.am
index 089884b..696a516 100644 (file)
--- a/libjava/include/Makefile.am
+++ b/libjava/include/Makefile.am
@@ -2,7 +2,14 @@
 
 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__HEADERS = jni.h jawt.h jawt_md.h jvmpi.h
+tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
+## The 'jni.h' here is fairly hacky, but it is simpler than trying to
+## tell Classpath about our peculiar install directory.
+tool_include__HEADERS = jni_md.h ../classpath/include/jawt.h \
+       ../classpath/include/jawt_md.h jvmpi.h ../classpath/include/jni.h