From fcbf6bcc159d64d9600f318f6a1cc3f0aeeb499b Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Wed, 23 Feb 2005 16:00:06 +0000 Subject: [PATCH] * libltdl/Makefile.am (install-data-local): Don't forget about $(DESTDIR). * libltdl/loaders/Makefile.am (install-data-local): Ditto. * NEWS: Updated. --- ChangeLog | 7 +++++++ NEWS | 1 + libltdl/Makefile.am | 5 +++-- libltdl/loaders/Makefile.am | 5 +++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18c3b8bc6..84d6b10b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-02-23 Gary V. Vaughan + + * libltdl/Makefile.am (install-data-local): Don't forget about + $(DESTDIR). + * libltdl/loaders/Makefile.am (install-data-local): Ditto. + * NEWS: Updated. + 2005-02-23 Gary V. Vaughan Preserving the installed timestamps for libltdl sources from diff --git a/NEWS b/NEWS index a89178eb6..663533fc2 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team: * Support for Portland Group compiler on GNU/Linux. * Fix libltdl on static platforms. +* Fix spurious reconfiguration of newly installed libltdl sources. * Support for linux-dietlibc (`diet' as well as `diet-dyn', separately). * `libtoolize --install' now also installs `install-sh'. * Support (mostly) for DragonFly BSD. diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am index c51aeed1e..2d5b9e06a 100644 --- a/libltdl/Makefile.am +++ b/libltdl/Makefile.am @@ -80,9 +80,10 @@ ltdldatafiles = COPYING.LIB Makefile.am README configure.ac \ ## To avoid spurious reconfiguration when the user installs these files ## with libtoolize, we have to preserve their timestamps carefully: install-data-local: - $(mkinstalldirs) $(ltdldatadir) + -rm -rf $(DESTDIR)$(ltdldatadir) + $(mkinstalldirs) $(DESTDIR)$(ltdldatadir) $(AMTAR) cf - $(ltdldatafiles) \ - | ( cd $(ltdldatadir) && $(AMTAR) xf -; ) + | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) ## Make sure these will be cleaned even when they're not built by default: CLEANFILES = libltdl.la libltdlc.la libdlloader.la diff --git a/libltdl/loaders/Makefile.am b/libltdl/loaders/Makefile.am index 7b44e767e..8333cbeca 100644 --- a/libltdl/loaders/Makefile.am +++ b/libltdl/loaders/Makefile.am @@ -57,9 +57,10 @@ ltdldatafiles = Makefile.am dld_link.c dlopen.c dyld.c \ ## To avoid spurious reconfiguration when the user installs these files ## with libtoolize, we have to preserve their timestamps carefully: install-data-local: - $(mkinstalldirs) $(ltdldatadir) + -rm -rf $(DESTDIR)$(ltdldatadir) + $(mkinstalldirs) $(DESTDIR)$(ltdldatadir) $(AMTAR) cf - $(ltdldatafiles) \ - | ( cd $(ltdldatadir) && $(AMTAR) xf -; ) + | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) ../libdlloader.la: cd ..; $(MAKE) $(AM_MAKEFLAGS) libdlloader.la -- 2.47.2