* 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.
(pkgdata_DATA): List config.guess and config.sub here
(pkgdata_SCRIPTS): instead of here.

diff --git a/ChangeLog b/ChangeLog
index 3ac407be1bcf1157f78973a49edbeda43de0b685..7a9336ff59d10df667d243b9967442ecbfdaf8b5 100644 (file)
--- 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.
+       (pkgdata_DATA): List config.guess and config.sub here
+       (pkgdata_SCRIPTS): instead of here.
+
 2004-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 25eeb415179e80a8e86983e39ea5033d6dcc0430..451a8fbac9192f167afcaa0baf6717f64719fa32 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,13 +18,14 @@ FLIBS = @FLIBS@
 aclocal_macros = libtool.m4 ltdl.m4
 
 EXTRA_DIST = $(aclocal_macros) bootstrap libtoolize.in ltmain.in \
-       mkstamp ChangeLog.0 ChangeLog.1
+       mkstamp ChangeLog.0 ChangeLog.1 config.guess config.sub
 CLEANFILES = libtool libtoolize ltmain.shT
 
-# These are required by libtoolize.
-pkgdata_SCRIPTS = config.guess config.sub
-pkgdata_DATA = 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
+pkgdata_DATA = config.guess config.sub ltmain.sh
+ 
 # This macro file should be visible to Automake's aclocal.
 aclocal_DATA = $(aclocal_macros)
 
@@ -77,6 +78,10 @@ install-data-hook:
 uninstall-local:
        -rm -rf $(DESTDIR)$(pkgdatadir)/libltdl
 
+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  ##