diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-08-22 20:37:36 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2006-08-22 20:37:36 +0000 |
| commit | df3e8c70fd12a8702e4b4c9e1410e27ca88c21b8 (patch) | |
| tree | f54905dce8ace4179ad3874a31cb8155be9bb6df /libjava/gnu/classpath/natSystemProperties.cc | |
| parent | 9a23b833613b375031e84fc9c7dcb3b5ab875d42 (diff) | |
| download | gcc-df3e8c70fd12a8702e4b4c9e1410e27ca88c21b8.zip gcc-df3e8c70fd12a8702e4b4c9e1410e27ca88c21b8.tar.gz gcc-df3e8c70fd12a8702e4b4c9e1410e27ca88c21b8.tar.bz2 | |
re PR libgcj/27890 (lib/logging.properties pollutes common namespace)
2006-08-22 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/27890
* gnu/classpath/natSystemProperties.cc (insertSystemProperties):
Set gnu.classpath.home.url to TOOLEXECLIBDIR.
* configure.ac: Do not add --with-native-libdir to
ac_configure_args.
* java/security/libgcj.security: Remove file.
* java/util/logging/logging.properties: Likewise.
* classpath/m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): New macro.
* classpath/resource/Makefile.am (loggingdir): Define to
toolexeclibdir.
(securitydir): Likewise.
* classpath/configure.ac: Call CLASSPATH_TOOLEXECLIBDIR.
Set default nativeexeclibdir using toolexeclibdir.
* HACKING: Fix classpath aclocal arguments.
* Makefile.am (secdir): Remove variable.
(propdir): Likewise.
(AM_CXXFLAGS): Replace LIBDIR definition with TOOLEXECLIBDIR
definition.
(all_property_files): Remove variable.
(install-data-local): Do not install libgcj.security or
logging.properties.
* configure, Makefile.in, classpath/configure,
classpath/Makefile.in, classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/target/Linux/Makefile.in,
classpath/native/target/Makefile.in,
classpath/native/target/generic/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in, classpath/aclocal.m4,
classpath/examples/Makefile.in, aclocal.m4: Regenerate.
From-SVN: r116332
Diffstat (limited to 'libjava/gnu/classpath/natSystemProperties.cc')
| -rw-r--r-- | libjava/gnu/classpath/natSystemProperties.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libjava/gnu/classpath/natSystemProperties.cc b/libjava/gnu/classpath/natSystemProperties.cc index e78ca74..958fdcb 100644 --- a/libjava/gnu/classpath/natSystemProperties.cc +++ b/libjava/gnu/classpath/natSystemProperties.cc @@ -183,11 +183,11 @@ gnu::classpath::SystemProperties::insertSystemProperties (java::util::Properties // redefine `java.home' with `-D' if necessary. SET ("java.home", JAVA_HOME); 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]; + // This is set to $(toolexeclibdir) because we use this to find + // .security files at runtime. + char val2[sizeof ("file://") + sizeof (TOOLEXECLIBDIR) + 1]; strcpy (val2, "file://"); - strcat (val2, LIBDIR); + strcat (val2, TOOLEXECLIBDIR); SET ("gnu.classpath.home.url", val2); SET ("file.encoding", default_file_encoding); |