From eee96b1bb085e08d7a6eb415bb42e61122914268 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 11 Jan 2007 00:01:27 +0000 Subject: Readd missing chunks from r116332: 2007-01-10 Matthias Klose Readd missing chunks from r116332: * m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): New macro. * resource/Makefile.am (loggingdir): Define to toolexeclibdir. (securitydir): Likewise. * configure.ac: Call CLASSPATH_TOOLEXECLIBDIR. Set default nativeexeclibdir using toolexeclibdir. Readd missing chunks from r115839: * native/jni/gtk-peer/Makefile.am (libgtkpeer_la_LDFLAGS): Add -avoid-version. * native/jawt/Makefile.am (libjawt_la_LDFLAGS): Add -avoid-version. * configure, Makefile.in, doc/Makefile.in, doc/api/Makefile.in, examples/Makefile.in, external/Makefile.in, external/jsr166/Makefile.in, external/relaxngDatatype/Makefile.in, external/sax/Makefile.in, external/w3c_dom/Makefile.in, include/Makefile.in, lib/Makefile.in, native/Makefile.in, native/fdlibm/Makefile.in, native/jawt/Makefile.in, native/jni/Makefile.in, native/jni/classpath/Makefile.in, native/jni/gconf-peer/Makefile.in, native/jni/gtk-peer/Makefile.in native/jni/java-io/Makefile.in, native/jni/java-lang/Makefile.in, native/jni/java-net/Makefile.in, native/jni/java-nio/Makefile.in, native/jni/java-util/Makefile.in, native/jni/midi-alsa/Makefile.in, native/jni/midi-dssi/Makefile.in, native/jni/native-lib/Makefile.in, native/jni/qt-peer/Makefile.in, native/jni/xmlj/Makefile.in, native/plugin/Makefile.in, resource/Makefile.in, scripts/Makefile.in, tools/Makefile.in: Regenerate From-SVN: r120654 --- libjava/classpath/scripts/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'libjava/classpath/scripts') diff --git a/libjava/classpath/scripts/Makefile.in b/libjava/classpath/scripts/Makefile.in index d8ad93b..6476f7b 100644 --- a/libjava/classpath/scripts/Makefile.in +++ b/libjava/classpath/scripts/Makefile.in @@ -283,6 +283,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +toolexeclibdir = @toolexeclibdir@ vm_classes = @vm_classes@ EXTRA_DIST = check_jni_methods.sh generate-locale-list.sh import-cacerts.sh all: all-am -- cgit v1.1