From: Scott James Remnant <scott@netsplit.com>
Date: Tue, 3 Feb 2004 22:05:07 +0000 (+0000)
Subject: * Makefile.am (install-data-hook): Manually make config.guess
X-Git-Tag: release-1-9b~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4ae55328695f8ad6a3811d085cb53d07c236db4;p=thirdparty%2Flibtool.git

* Makefile.am (install-data-hook): Manually make config.guess
and config.sub executable after they are installed as _DATA.
We can't use _SCRIPTS because the various program name
transforms may be applied to them.
(dist_pkgdata_DATA): List config.guess and config.sub here
(pkgdata_SCRIPTS): instead of here.
---

diff --git a/ChangeLog b/ChangeLog
index 9389a2b3d..14d34f803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-03  Scott James Remnant  <scott@netsplit.com>
+
+	* Makefile.am (install-data-hook): Manually make config.guess
+	and config.sub executable after they are installed as _DATA.
+	We can't use _SCRIPTS because the various program name
+	transforms may be applied to them.
+	(dist_pkgdata_DATA): List config.guess and config.sub here
+	(pkgdata_SCRIPTS): instead of here.
+
 2003-02-03  Scott James Remnant  <scott@netsplit.com>
 
 	* ltmain.in: Create temporary directory under a strict umask
diff --git a/Makefile.am b/Makefile.am
index f29f7e786..788a2f7aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,10 @@ EXTRA_DIST = bootstrap libtoolize.in ltmain.in config/mkstamp stamp-vcl \
 	ChangeLog.2000 ChangeLog.2001 ChangeLog.2002 ChangeLog.2003
 CLEANFILES = libtool libtoolize ltmain.shT
 
-# These are required by libtoolize.
-pkgdata_SCRIPTS = config/config.guess config/config.sub
-pkgdata_DATA = config/ltmain.sh
+# These are required by libtoolize and must be executable when installed.
+# Since _SCRIPTS gets the program transform applied we make them
+# executable by hand
+dist_pkgdata_DATA = config/config.guess config/config.sub config/ltmain.sh
 
 # Me maintain our own macros to provent problems with ancient definitions.
 # lt~obsolete.m4 doesn't belong here, it's for bootstrapping us only
@@ -81,6 +82,10 @@ install-data-local:
 	-rm -rf $(DESTDIR)$(aclocaldir)/ltdl.m4
 	-rm -rf $(DESTDIR)$(aclocaldir)/libtool.m4
 
+install-data-hook:
+	chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
+	chmod +x $(DESTDIR)$(pkgdatadir)/config.sub
+
 
 ## ---------------------------------------------------------------- ##
 ##  Everything past here is useful to the maintainer, but probably  ##