From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 10 Aug 2005 14:07:29 +0000 (+0000)
Subject: * Makefile.am, libltdl/Makefile.am: Install libltdl data files
X-Git-Tag: release-1-5-20~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3ed3ebf4cace9820393ed61ed21c3f635f1b72a;p=thirdparty%2Flibtool.git

* Makefile.am, libltdl/Makefile.am: Install libltdl data files
in correct order, by Automake rules.  Really fixes ownership and
timestamp problems.
Reported by Peter Breitenlohner <peb@mppmu.mpg.de> and
Charles Wilson <cygwin@cwilson.fastmail.fm>.
---

diff --git a/ChangeLog b/ChangeLog
index 5a4d12168..c0368ff59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am, libltdl/Makefile.am: Install libltdl data files
+	in correct order, by Automake rules.  Really fixes ownership and
+	timestamp problems.
+	Reported by Peter Breitenlohner <peb@mppmu.mpg.de> and
+	Charles Wilson <cygwin@cwilson.fastmail.fm>.
+
 2005-08-10  Peter Ekberg  <peda@lysator.liu.se>
 
 	* libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG): Set ac_ext to cpp,
diff --git a/Makefile.am b/Makefile.am
index e4c8e6d86..6ba480381 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,29 @@ aclocal_DATA = $(aclocal_macros)
 # The standalone libtool script, and the libtool distributor.
 bin_SCRIPTS = libtool libtoolize
 
+## These are installed as a subdirectory of pkgdatadir so that
+## libtoolize --ltdl can find them later:
+## Preserve order here so that generated files remain newer than
+## their dependencies.
+ltdldatadir = $(pkgdatadir)/libltdl
+ltdldata_DATA = \
+	libltdl/COPYING.LIB \
+	libltdl/README \
+	libltdl/configure.ac \
+	libltdl/Makefile.am \
+	libltdl/ltdl.c \
+	libltdl/ltdl.h \
+	libltdl/config.guess \
+	libltdl/config.sub \
+	libltdl/install-sh \
+	libltdl/missing \
+	libltdl/ltmain.sh \
+	libltdl/acinclude.m4 \
+	libltdl/aclocal.m4 \
+	libltdl/Makefile.in \
+	libltdl/configure \
+	libltdl/config-h.in
+
 libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
 	$(SHELL) $(top_builddir)/config.status --recheck
 	chmod +x $@
@@ -72,10 +95,14 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
 
 # Create and install libltdl
 install-data-hook:
-	cd libltdl && $(MAKE) local-install-files
 	chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
 	chmod +x $(DESTDIR)$(pkgdatadir)/config.sub
 	chmod +x $(DESTDIR)$(pkgdatadir)/install-sh
+	chmod +x $(DESTDIR)$(pkgdatadir)/libltdl/config.guess
+	chmod +x $(DESTDIR)$(pkgdatadir)/libltdl/config.sub
+	chmod +x $(DESTDIR)$(pkgdatadir)/libltdl/install-sh
+	chmod +x $(DESTDIR)$(pkgdatadir)/libltdl/configure
+	chmod +x $(DESTDIR)$(pkgdatadir)/libltdl/missing
 
 # Uninstall libltdl
 uninstall-local:
diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 23ea87bd5..2ceadb265 100644
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -30,22 +30,3 @@ ltdl.lo: ltdl.h config.h
 $(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
-
-## These are installed as a subdirectory of pkgdatadir so that
-## libtoolize --ltdl can find them later:
-ltdldatadir = $(datadir)/libtool/libltdl
-ltdldatafiles = COPYING.LIB README acinclude.m4 aclocal.m4 \
-		Makefile.am Makefile.in configure.ac configure \
-		config-h.in config.guess config.sub \
-		install-sh missing ltmain.sh \
-		ltdl.c ltdl.h
-
-## To avoid spurious reconfiguration when the user installs these files
-## with libtoolize, we have to preserve their timestamps carefully:
-local-install-files: $(ltdldatafiles)
-	-rm -rf $(DESTDIR)$(ltdldatadir)
-	$(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
-	( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
-	  | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
-	chown -R root $(DESTDIR)$(ltdldatadir) && \
-	chgrp -R root $(DESTDIR)$(ltdldatadir) || :