diff options
| author | Tom Tromey <tromey@redhat.com> | 2003-03-26 22:31:52 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-03-26 22:31:52 +0000 |
| commit | 1c81e34352a99967cc1f42c82d71b0dfcfb57332 (patch) | |
| tree | fecfca59efdeac675728e69ba04d48644f960f7d | |
| parent | de132314bc4f516e901fc30cd95152f747313ad5 (diff) | |
| download | gcc-1c81e34352a99967cc1f42c82d71b0dfcfb57332.zip gcc-1c81e34352a99967cc1f42c82d71b0dfcfb57332.tar.gz gcc-1c81e34352a99967cc1f42c82d71b0dfcfb57332.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 | ||||
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 6 |
4 files changed, 15 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9ad5618..78f09cb 100644 --- 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 97126bc..563b0b0 100644 --- 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 de5e661..5a1a983 100644 --- 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 b4c1510..2cf312e 100644 --- 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); |