From 4623df015adf47d07e271ab7364016eca01a9e29 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Wed, 22 May 2013 21:25:59 +0000 Subject: configure.ac (dbexecdir): Base on $(toolexeclibdir), not $(libdir). 2013-05-22 Mark Mitchell Sandra Loosemore libjava/ * configure.ac (dbexecdir): Base on $(toolexeclibdir), not $(libdir). * Makefile.am (pkgconfigdir): Likewise. * configure: Regenerated. * Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. libjava/classpath/ * configure.ac: Define host_noncanonical and target_noncanonical. Support --enable-version-specific-runtime-libs. * m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): Match libjava definition of toolexeclibdir. * configure: Regenerated. * Makefile.in: Regenerated. * doc/api/Makefile.in: Regenerated. * doc/Makefile.in: Regenerated. * examples/Makefile.in: Regenerated. * external/jsr166/Makefile.in: Regenerated. * external/Makefile.in: Regenerated. * external/relaxngDatatype/Makefile.in: Regenerated. * external/sax/Makefile.in: Regenerated. * external/w3c_dom/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * lib/Makefile.in: Regenerated. * native/fdlibm/Makefile.in: Regenerated. * native/jawt/Makefile.in: Regenerated. * native/jni/Makefile.in: Regenerated. * native/jni/gconf-peer/Makefile.in: Regenerated. * native/jni/gstreamer-peer/Makefile.in: Regenerated. * native/jni/gtk-peer/Makefile.in: Regenerated. * native/jni/java-io/Makefile.in: Regenerated. * native/jni/java-lang/Makefile.in: Regenerated. * native/jni/java-math/Makefile.in: Regenerated. * native/jni/java-net/Makefile.in: Regenerated. * native/jni/java-nio/Makefile.in: Regenerated. * native/jni/java-util/Makefile.in: Regenerated. * native/jni/Makefile.in: Regenerated. * native/jni/midi-alsa/Makefile.in: Regenerated. * native/jni/midi-dssi/Makefile.in: Regenerated. * native/jni/native-lib/Makefile.in: Regenerated. * native/jni/qt-peer/Makefile.in: Regenerated. * native/jni/xmlj/Makefile.in: Regenerated. * native/Makefile.in: Regenerated. * native/plugin/Makefile.in: Regenerated. * resource/Makefile.in: Regenerated. * scripts/Makefile.in: Regenerated. * tools/Makefile.in: Regenerated. Co-Authored-By: Sandra Loosemore From-SVN: r199221 --- libjava/classpath/doc/api/Makefile.in | 58 +++++++++-------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) (limited to 'libjava/classpath/doc/api') diff --git a/libjava/classpath/doc/api/Makefile.in b/libjava/classpath/doc/api/Makefile.in index 88bd46b..139c998 100644 --- a/libjava/classpath/doc/api/Makefile.in +++ b/libjava/classpath/doc/api/Makefile.in @@ -36,7 +36,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = doc/api -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \ @@ -68,9 +68,7 @@ CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = -DIST_SOURCES = DATA = $(noinst_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ ANTLR = @ANTLR@ @@ -274,9 +272,12 @@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ +target_noncanonical = @target_noncanonical@ target_os = @target_os@ target_vendor = @target_vendor@ +toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ +toolexecmainlibdir = @toolexecmainlibdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -330,37 +331,6 @@ TAGS: ctags: CTAGS CTAGS: - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done check-am: all-am check: check-am all-am: Makefile $(DATA) @@ -459,16 +429,16 @@ uninstall-am: uninstall-local .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-local + clean-local distclean distclean-generic distclean-libtool dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-local @CREATE_API_DOCS_TRUE@install-data-local: -- cgit v1.1