From 02dd30c4b5a5adf283d75fd5ae2d9c2f11800e3f Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 5 Jun 2006 15:08:56 +0000 Subject: [PATCH] PR gcc/27818: * Makefile.in: Rebuilt. * Makefile.am (install-data-local): Define conditionally. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114389 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/libltdl/ChangeLog | 6 ++++++ libjava/libltdl/Makefile.am | 3 +++ libjava/libltdl/Makefile.in | 11 ++++++----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog index f510aa9700f..318b1a9b063 100644 --- a/libjava/libltdl/ChangeLog +++ b/libjava/libltdl/ChangeLog @@ -1,3 +1,9 @@ +2006-06-05 Tom Tromey + + PR gcc/27818: + * Makefile.in: Rebuilt. + * Makefile.am (install-data-local): Define conditionally. + 2006-04-08 Andreas Tobler * configure: Rebuilt. diff --git a/libjava/libltdl/Makefile.am b/libjava/libltdl/Makefile.am index b8d5cf1b14f..70c31ed1163 100644 --- a/libjava/libltdl/Makefile.am +++ b/libjava/libltdl/Makefile.am @@ -42,6 +42,8 @@ ltdldatafiles = COPYING.LIB README acinclude.m4 aclocal.m4 \ install-sh missing ltmain.sh \ ltdl.c ltdl.h +## GCJ LOCAL: fix install buglet. See PR 27818 +if INSTALL_LTDL ## To avoid spurious reconfiguration when the user installs these files ## with libtoolize, we have to preserve their timestamps carefully: install-data-local: @@ -49,3 +51,4 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(ltdldatadir) ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \ | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) +endif diff --git a/libjava/libltdl/Makefile.in b/libjava/libltdl/Makefile.in index 6bacd8783f2..05dc43dccf1 100644 --- a/libjava/libltdl/Makefile.in +++ b/libjava/libltdl/Makefile.in @@ -577,6 +577,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@INSTALL_LTDL_FALSE@install-data-local: clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ @@ -654,11 +655,11 @@ $(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck -install-data-local: - -rm -rf $(DESTDIR)$(ltdldatadir) - $(mkinstalldirs) $(DESTDIR)$(ltdldatadir) - ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \ - | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) +@INSTALL_LTDL_TRUE@install-data-local: +@INSTALL_LTDL_TRUE@ -rm -rf $(DESTDIR)$(ltdldatadir) +@INSTALL_LTDL_TRUE@ $(mkinstalldirs) $(DESTDIR)$(ltdldatadir) +@INSTALL_LTDL_TRUE@ ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \ +@INSTALL_LTDL_TRUE@ | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -- 2.11.0