diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/Makefile.am | 3 | ||||
| -rw-r--r-- | libjava/Makefile.in | 3 | ||||
| -rw-r--r-- | libjava/java/lang/natSystem.cc | 7 |
4 files changed, 16 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2126c58..07fc050 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 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: * configure, aclocal.m4, Makefile.am: Rebuilt. * configure.in: Pass `--with-auxdir' to subdir configure. Don't diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 23d8baa..b2cefc9 100644 --- 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 17ce537..b64b68c 100644 --- 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 57e135c..7fff337 100644 --- 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); |