natRuntime.cc (insertSystemProperties): Set gnu.classpath.home.url.

	* java/lang/natRuntime.cc (insertSystemProperties): Set
	gnu.classpath.home.url.
	* Makefile.in: Rebuilt.
	* Makefile.am: Define LIBDIR.

From-SVN: r64905

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9ad5618988f2e10531e14a13f9c296d990bbcef3..78f09cb3d4dd2696c4e25392b48724d422f92be0 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-26  Tom Tromey  <tromey@redhat.com>
+
+       * java/lang/natRuntime.cc (insertSystemProperties): Set
+       gnu.classpath.home.url.
+       * Makefile.in: Rebuilt.
+       * Makefile.am: Define LIBDIR.
+
 2003-03-25  Michael Koch  <konqueror@gmx.de>
 
        * java/io/FileInputStream.java

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 97126bcd715dfab937d1e511d4a2b9743551aac4..563b0b058c2d28abde4049b7733e69caf1d2c58a 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -97,7 +97,7 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
 ## Detect bugs in the verifier implementation, and maybe other places.
        -Wswitch-enum \
        @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
-       -DPREFIX="\"$(prefix)\""
+       -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\""
 if USING_GCC
 AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
 else

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index de5e66186c183a75b1791f63a4abd972777560a6..5a1a9837ab620172ab98cf03ae3011b546a55b16 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -191,7 +191,7 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
        -fdollars-in-identifiers \
        -Wswitch-enum \
        @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
-       -DPREFIX="\"$(prefix)\""
+       -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\""
 
 @USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
 @USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@

diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index b4c15106365373fa1c59ecc315547fe193bc2f86..2cf312ea86267910df57992f95f2ee51c9ceed05 100644 (file)
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -422,6 +422,12 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
   // redefine `java.home' with `-D' if necessary.
   SET ("java.home", PREFIX);
   SET ("gnu.classpath.home", PREFIX);
+  // This is set to $(libdir) because we use this to find .security
+  // files at runtime.
+  char val2[sizeof ("file://") + sizeof (LIBDIR) + 1];
+  strcpy (val2, "file://");
+  strcat (val2, LIBDIR);
+  SET ("gnu.classpath.home.url", val2);
 
   SET ("file.encoding", default_file_encoding);