Re: bug in m4/mkdirp.m4

[Peter O'Gorman]

Peter O'Gorman wrote:
> Hi,
> If install-sh loses its execute bit, it is usually okay, install-sh is 
> usually called as "$(SHELL) $(install_sh)" except that mkdir_p is set to 
> "$(install_sh) -d" on some systems. I suggest the attached patch.

Actually, it turns out that my patch is not correct. mkinstalldirs, if set 
to mkinstalldirs already has a $(SHELL).

I think this patch is better.

Peter

Index: lib/am/distdir.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.61
diff -u -3 -p -u -r1.61 distdir.am
--- lib/am/distdir.am   14 May 2005 20:28:53 -0000      1.61
+++ lib/am/distdir.am   29 Jul 2005 00:40:10 -0000
@@ -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 | \
Index: m4/install-sh.m4
===================================================================
RCS file: /cvs/automake/automake/m4/install-sh.m4,v
retrieving revision 1.4
diff -u -3 -p -u -r1.4 install-sh.m4
--- m4/install-sh.m4    9 Jan 2005 14:46:21 -0000       1.4
+++ m4/install-sh.m4    29 Jul 2005 00:40:10 -0000
@@ -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)])
Index: m4/strip.m4
===================================================================
RCS file: /cvs/automake/automake/m4/strip.m4,v
retrieving revision 1.8
diff -u -3 -p -u -r1.8 strip.m4
--- m4/strip.m4 9 Jan 2005 14:46:21 -0000       1.8
+++ m4/strip.m4 29 Jul 2005 00:40:10 -0000
@@ -24,5 +24,5 @@ dnl Don't test for $cross_compiling = ye
 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])])