2005-10-03 Alexandre Duret-Lutz <adl@gnu.org>

    * tests/nobase.test: Exercise previous patch.

2005-10-03  Peter O'Gorman  <peter@pogma.com>  (tiny change)

    * lib/am/distdir.am: Remove $(SHELL) when calling install_sh
    * m4/strip.m4: Ditto.
    * m4/install-sh.m4: Add $(SHELL) to the definition of install_sh

diff --git a/ChangeLog b/ChangeLog
index 04413dc866e5b1e5ed3d692bbc653a30b5c458ac..303fa6a5691dd041dd369d09eb20a826a883fb28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-03  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * tests/nobase.test: Exercise previous patch.
+
+2005-10-03  Peter O'Gorman  <peter@pogma.com>  (tiny change)
+
+       * lib/am/distdir.am: Remove $(SHELL) when calling install_sh
+       * m4/strip.m4: Ditto.
+       * m4/install-sh.m4: Add $(SHELL) to the definition of install_sh
+
 2005-09-13  Paul Eggert  <eggert@cs.ucla.edu>
 
        * doc/automake.texi (limitations on file names): New section.

diff --git a/Makefile.in b/Makefile.in
index 7c8ec0677a042e47f5d5bf73d01bebe288b03298..4d23e960d05822bfb869f0c1d29c365e8f805742 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -430,7 +430,7 @@ distdir: $(DISTFILES)
        -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-         ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+         ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
        || chmod -R a+r $(distdir)
        @if find $(distdir) -type f -print | \
          grep '^...................................................................................................' 1>&2; then \

diff --git a/configure b/configure
index b14268c1ad7b0a7a7aafe646cdc884cb2fd2a9ec..85b9ca34f074ef45bffa654748cbf7b3f2ab2868 100755 (executable)
--- a/configure
+++ b/configure
@@ -1979,7 +1979,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -2078,7 +2078,7 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.

diff --git a/doc/stamp-vti b/doc/stamp-vti
index 0cbde4da4e0105a96168de904a16c62ffbffb0cf..2a58ebf6d2ee5039e316cedc9f03769a02777567 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 27 July 2005
-@set UPDATED-MONTH July 2005
+@set UPDATED 30 September 2005
+@set UPDATED-MONTH September 2005
 @set EDITION 1.9a
 @set VERSION 1.9a

diff --git a/doc/version.texi b/doc/version.texi
index 0cbde4da4e0105a96168de904a16c62ffbffb0cf..2a58ebf6d2ee5039e316cedc9f03769a02777567 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 27 July 2005
-@set UPDATED-MONTH July 2005
+@set UPDATED 30 September 2005
+@set UPDATED-MONTH September 2005
 @set EDITION 1.9a
 @set VERSION 1.9a

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 151f5f0ff5096b9b8b029688fda5824fc844c131..32e8c4d1a3d96e9fd3da576a44862484b57aebae 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -212,7 +212,7 @@ if %?TOPDIR_P%
        -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-         ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+         ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
        || chmod -R a+r $(distdir)
 if %?FILENAME_FILTER%
        @if find $(distdir) -type f -print | \

diff --git a/m4/install-sh.m4 b/m4/install-sh.m4
index d8beee4cd069ddd20a7b3b9b4963437fd5faa23c..32c2ebb2b2313601122f4432b17c100835126d74 100644 (file)
--- a/m4/install-sh.m4
+++ b/m4/install-sh.m4
@@ -10,5 +10,5 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])

diff --git a/m4/strip.m4 b/m4/strip.m4
index 4fe19e90bd37c24db5774341cbe29dbb644b1141..43435dcf231e083849f06b3ec6efae7609dd61eb 100644 (file)
--- a/m4/strip.m4
+++ b/m4/strip.m4
@@ -24,5 +24,5 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])

diff --git a/tests/nobase.test b/tests/nobase.test
index 86766079987c9194d6ce24535d384b23b33b9e0b..99d4babcdd9bae595dd11bd07303240b469a6669 100755 (executable)
--- a/tests/nobase.test
+++ b/tests/nobase.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2005  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -108,12 +108,22 @@ main (int argc, char *argv[])
 EOF
 cp source.c source2.c
 
+rm install-sh
+
 libtoolize
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -a
+$AUTOMAKE -a --copy
 ./configure --prefix `pwd`/inst --program-prefix=p
 
+# Remove the 'x' bits just for fun.  (Peter O'Gorman said: "If an
+# upstream source tarball does not use the autotools, it is sometimes
+# easier to build if it is modified to use them. Then a patch is
+# generated, and applied to the unpacked clean sources during the
+# build. patch(1) knows nothing about permissions, so executable bits
+# etc can disappear.")
+chmod -x install-sh
+
 $MAKE
 $MAKE test-install-data
 $MAKE test-install-exec