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

libjava/ChangeLog

+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

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

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@

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);