re PR libgcj/3059 (System doesn't set java.home property)

	Fix for PR libgcj/3059:
	* java/lang/natSystem.cc (init_properties): Define `java.home'.
	* Makefile.in: Rebuilt.
	* Makefile.am (AM_CXXFLAGS): Define PREFIX.

From-SVN: r43040

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2126c580b2ed60a0ca92c9d25b7f7ddab0eea9e8..07fc050631f40638fa3a9e8f5e974db03fad164f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-07  Tom Tromey  <tromey@redhat.com>
+
+       Fix for PR libgcj/3059:
+       * java/lang/natSystem.cc (init_properties): Define `java.home'.
+       * Makefile.in: Rebuilt.
+       * Makefile.am (AM_CXXFLAGS): Define PREFIX.
+
 2001-06-07  Tom Tromey  <tromey@redhat.com>
 
        For PR bootstrap/3075:

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 23d8baa5e293baa61251ae797442f3655c18359a..b2cefc9cc31348d2810f9cbd2e12343236600d70 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -90,7 +90,8 @@ WARNINGS = -W -Wall
 AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
 ## Some systems don't allow `$' in identifiers by default, so we force it.
        -fdollars-in-identifiers \
-       @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE
+       @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
+       -DPREFIX="\"$(prefix)\""
 if USING_GCC
 AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
 else

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 17ce537e5fedb38ffbb96cd0ac60c813de1b4f85..b64b68ca2ce52e0c170be055e6ed62154810c9b6 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -169,7 +169,8 @@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
 WARNINGS = -W -Wall
 AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
        -fdollars-in-identifiers \
-       @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE
+       @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
+       -DPREFIX="\"$(prefix)\""
 
 @USING_GCC_TRUE@AM_CFLAGS = \
 @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)

diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index 57e135c7db51b8d27b0ff9d572700a8c36e769a7..7fff337b8aeab18bb9b2780ff8e5dbaf0f4fa288 100644 (file)
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -320,8 +320,11 @@ java::lang::System::init_properties (void)
   SET ("java.specification.name", "Java(tm) Language Specification");
   SET ("java.specification.vendor", "Sun Microsystems Inc.");
 
-  // FIXME: how to set this given location-independence?
-  // SET ("java.home", "FIXME");
+  // This definition is rather arbitrary: we choose $(prefix).  In
+  // part we do this because most people specify only --prefix and
+  // nothing else when installing gcj.  Plus, people are free to
+  // redefine `java.home' with `-D' if necessary.
+  SET ("java.home", PREFIX);
   
   SET ("file.encoding", default_file_encoding);