From c33b7bf04a0abea0ca5ed8ca1cbdf0a9127a64db Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Tue, 5 Apr 2005 23:46:09 +0000 Subject: re PR libgcj/20750 (libgcj needs a --with-java-home configure option) 2005-04-05 Thomas Fitzsimmons * doc/install.texi (Configuration): Document --with-java-home. 2005-04-05 Thomas Fitzsimmons PR libgcj/20750 * Makefile.am (AM_CXXFLAGS): Define JAVA_HOME. * Makefile.in: Regenerate. * configure.ac: Add --with-java-home option. * configure: Regenerate. * external/Makefile.in: Regenerate. * external/sax/Makefile.in: Regenerate. * external/w3c_dom/Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. * java/lang/natRuntime.cc (insertSystemProperties): Set java.home to JAVA_HOME macro. From-SVN: r97671 --- libjava/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'libjava/Makefile.am') diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 4368cddc8da..8d6a9a7f88d 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -121,6 +121,14 @@ pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java jar_DATA = libgcj-$(gcc_version).jar +if JAVA_HOME_SET +JAVA_HOME_DIR = $(JAVA_HOME) +BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar +else +JAVA_HOME_DIR = $(prefix) +BOOT_CLASS_PATH_DIR = $(jardir)/$(jar_DATA) +endif + ## FIXME: Using libdir violates GNU coding standards. secdir = $(libdir)/security ## Where to install default logging property file. @@ -184,7 +192,8 @@ AM_CXXFLAGS = \ -D_GNU_SOURCE \ -DPREFIX="\"$(prefix)\"" \ -DLIBDIR="\"$(libdir)\"" \ - -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \ + -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" \ + -DBOOT_CLASS_PATH="\"$(BOOT_CLASS_PATH_DIR)\"" \ -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \ -DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \ -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ -- cgit v1.2.3