From 0f8792bcc0f6391a9575fe31f95509747df0c4d5 Mon Sep 17 00:00:00 2001 From: doko Date: Thu, 11 Jan 2007 00:01:27 +0000 Subject: 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 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120654 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/lib/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'libjava/classpath/lib') diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in index 759cead840b..ea474fd9713 100644 --- a/libjava/classpath/lib/Makefile.in +++ b/libjava/classpath/lib/Makefile.in @@ -287,6 +287,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +toolexeclibdir = @toolexeclibdir@ vm_classes = @vm_classes@ JAVA_DEPEND = java.dep propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print) -- cgit v1.2.1