Hello,
On Sat, Jun 10, 2006 at 04:40:57PM +0200, Ralf Wildenhues wrote:
> OK to apply the patch below to Automake?
thank you for your patch. A minor nit: the same work can be done by
one sed in the pipe; see the attached variation of your patch.
Have a nice day,
Stepan
* m4/mkdirp.m4 (AM_PROG_MKDIR_P): Set `mkdir_p' to
`'$(MKDIR_P)'', so that it retains the per-directory value
computed by config.status.
* lib/am/distdir.am (distdir): do not use `$(mkdir_p)' from
a changed directory. Bugs reported by Ralf Menzel.
* THANKS: Update.
Index: lib/am/distdir.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.65
diff -u -r1.65 distdir.am
--- lib/am/distdir.am 6 Jun 2006 21:10:25 -0000 1.65
+++ lib/am/distdir.am 12 Jun 2006 13:19:00 -0000
@@ -112,9 +112,9 @@
## be specified for `dist' conditionally.)
##
case $$dist_files in \
- */*) ( cd "$(distdir)" && \
- $(mkdir_p) `echo "$$dist_files" | \
- sed -n 's,/[^/]*$$,,p' | sort -u`) ;; \
+ */*) $(mkdir_p) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
esac; \
##
##
Index: m4/mkdirp.m4
===================================================================
RCS file: /cvs/automake/automake/m4/mkdirp.m4,v
retrieving revision 1.10
diff -u -r1.10 mkdirp.m4
--- m4/mkdirp.m4 7 Jun 2006 05:38:29 -0000 1.10
+++ m4/mkdirp.m4 12 Jun 2006 13:19:01 -0000
@@ -11,5 +11,5 @@
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_PREREQ([2.59c])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-AC_SUBST([mkdir_p], [$MKDIR_P])dnl
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])dnl
])
