diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2005-10-03 20:48:59 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2005-10-03 20:48:59 +0000 |
| commit | 9bd67a2f5c8c5605ee44588dea619eb88e3287c9 (patch) | |
| tree | a72eaa93ede1982ef7c79532d3b13ac9d47c6478 | |
| parent | 6bbf73afa49bf6229b861da4c35e9d2a4230fa7f (diff) | |
| download | automake-9bd67a2f5c8c5605ee44588dea619eb88e3287c9.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | doc/stamp-vti | 4 | ||||
| -rw-r--r-- | doc/version.texi | 4 | ||||
| -rw-r--r-- | lib/am/distdir.am | 4 | ||||
| -rw-r--r-- | m4/install-sh.m4 | 2 | ||||
| -rw-r--r-- | m4/strip.m4 | 2 | ||||
| -rwxr-xr-x | tests/nobase.test | 14 |
9 files changed, 33 insertions, 13 deletions
@@ -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 7c8ec0677..4d23e960d 100644 --- 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 \ @@ -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 0cbde4da4..2a58ebf6d 100644 --- 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 0cbde4da4..2a58ebf6d 100644 --- 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 151f5f0ff..32e8c4d1a 100644 --- 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 d8beee4cd..32c2ebb2b 100644 --- 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 4fe19e90b..43435dcf2 100644 --- 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 867660799..99d4babcd 100755 --- 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 |