MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

From-SVN: r64905
This commit is contained in:
Tom Tromey 2003-03-26 22:31:52 +00:00 committed by Tom Tromey
parent de132314bc
commit 1c81e34352
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -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> 2003-03-25 Michael Koch <konqueror@gmx.de>
* java/io/FileInputStream.java * java/io/FileInputStream.java

2
libjava/Makefile.am
View File

@ -97,7 +97,7 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
## Detect bugs in the verifier implementation, and maybe other places. ## Detect bugs in the verifier implementation, and maybe other places.
-Wswitch-enum \ -Wswitch-enum \
@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \ @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
-DPREFIX="\"$(prefix)\"" -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\""
if USING_GCC if USING_GCC
AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS) AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
else else

2
libjava/Makefile.in
View File

@ -191,7 +191,7 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
-fdollars-in-identifiers \ -fdollars-in-identifiers \
-Wswitch-enum \ -Wswitch-enum \
@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \ @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_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
@USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@ @USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@

6
libjava/java/lang/natRuntime.cc
View File

@ -422,6 +422,12 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
// redefine `java.home' with `-D' if necessary. // redefine `java.home' with `-D' if necessary.
SET ("java.home", PREFIX); SET ("java.home", PREFIX);
SET ("gnu.classpath.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); SET ("file.encoding", default_file_encoding);