diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-22 20:37:36 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-22 20:37:36 +0000 |
| commit | 5a5c708ca485af170b08e32f7d612c1f084dcfd2 (patch) | |
| tree | f54905dce8ace4179ad3874a31cb8155be9bb6df /libjava/classpath/resource/Makefile.am | |
| parent | bf59186338bdd6827e4a38b7318a010e4905106c (diff) | |
| download | gcc-5a5c708ca485af170b08e32f7d612c1f084dcfd2.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116332 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/resource/Makefile.am')
| -rw-r--r-- | libjava/classpath/resource/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/classpath/resource/Makefile.am b/libjava/classpath/resource/Makefile.am index 4369810226f..09419642eac 100644 --- a/libjava/classpath/resource/Makefile.am +++ b/libjava/classpath/resource/Makefile.am @@ -1,7 +1,7 @@ ## used by automake to generate Makefile.in logging_DATA = java/util/logging/logging.properties -loggingdir = $(prefix)/lib +loggingdir = $(toolexeclibdir) security_DATA = java/security/classpath.security -securitydir = $(prefix)/lib/security +securitydir = $(toolexeclibdir)/security |