* configure.ac (AC_SUBST): Added JAVA_ARCH.

* src/cacao/Makefile.am [WITH_JAVA_RUNTIME_LIBRARY_OPENJDK]
(install-data-local, uninstall-local): New targets creating files
required for OpenJDK.

diff --git a/configure.ac b/configure.ac
index 5f654f7be1723aa6226597755ba2cc2be018fd2e..a0784e8c3d5ae84cad45cfcf5a184b2f6f8bc0f7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,7 @@ dnl define and substitute some architecture specific variables
 AC_DEFINE_UNQUOTED([ARCH_DIR], "${ARCH_DIR}", [architecture directory])
 AC_DEFINE_UNQUOTED([JAVA_ARCH], "${JAVA_ARCH}", [Java architecture name])
 AC_SUBST(ARCH_DIR)
+AC_SUBST(JAVA_ARCH)
 AC_SUBST(OS_DIR)
 AC_SUBST(USE_SCHEDULER)
 

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 2a5247afd4a716069e0ad0873e79e608858173be..73f5b839ac3fa782b472f9596de6c593709c1ace 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -91,6 +91,20 @@ cacao_DEPENDENCIES = \
        $(cacao_LDADD)
 
 
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
+install-data-local:
+       $(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server
+       $(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server
+       $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+       $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
+
+uninstall-local:
+       rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so
+       rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+       rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
+endif
+
+
 ## Local variables:
 ## mode: Makefile
 ## indent-tabs-mode: t