From e755a2a4e8b77db88805540d6443ec94a71434a0 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 24 Jun 2006 05:35:44 +0000 Subject: [PATCH] * 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. --- ChangeLog | 10 ++++++++++ Makefile.in | 6 +++--- THANKS | 1 + configure | 2 +- doc/Makefile.in | 6 +++--- lib/Automake/Makefile.in | 6 +++--- lib/Automake/tests/Makefile.in | 6 +++--- lib/Makefile.in | 6 +++--- lib/am/Makefile.in | 6 +++--- lib/am/distdir.am | 6 +++--- m4/Makefile.in | 6 +++--- m4/mkdirp.m4 | 2 +- tests/Makefile.in | 6 +++--- 13 files changed, 40 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa6ccae..265001f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-06-24 Stepan Kasal + Ralf Wildenhues + + * 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. + 2006-06-24 Eric Dorland Ralf Wildenhues diff --git a/Makefile.in b/Makefile.in index 26c11f6..d4e4d91 100644 --- a/Makefile.in +++ b/Makefile.in @@ -394,9 +394,9 @@ distdir: $(DISTFILES) sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 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; \ for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ diff --git a/THANKS b/THANKS index 179cdec..ced36a0 100644 --- a/THANKS +++ b/THANKS @@ -233,6 +233,7 @@ Rainer Orth ro@techfak.uni-bielefeld.de Rafael Laboissiere laboissiere@psy.mpg.de Raja R Harinath harinath@cs.umn.edu Ralf Corsepius corsepiu@faw.uni-ulm.de +Ralf Menzel menzel@ls6.cs.uni-dortmund.de Ralf Wildenhues Ralf.Wildenhues@gmx.de Ralph Schleicher rs@purple.UL.BaWue.DE Ramón García Fernández ramon@jl1.quim.ucm.es diff --git a/configure b/configure index 4f76829..7f91cba 100755 --- a/configure +++ b/configure @@ -1927,7 +1927,7 @@ fi { echo "$as_me:$LINENO: result: $MKDIR_P" >&5 echo "${ECHO_T}$MKDIR_P" >&6; } -mkdir_p=$MKDIR_P +mkdir_p='$(MKDIR_P)' for ac_prog in gawk mawk nawk awk do diff --git a/doc/Makefile.in b/doc/Makefile.in index 06a04e2..3dcdcd0 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -413,9 +413,9 @@ distdir: $(DISTFILES) sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 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; \ for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index c5c587f..4bbea3f 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -398,9 +398,9 @@ distdir: $(DISTFILES) sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 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; \ for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 516571e..0926c81 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -259,9 +259,9 @@ distdir: $(DISTFILES) sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 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; \ for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 80b178e..50211f8 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -374,9 +374,9 @@ distdir: $(DISTFILES) sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 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; \ for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index ff69585..1f2db95 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -248,9 +248,9 @@ distdir: $(DISTFILES) sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 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; \ for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 27d52fc..6a954d5 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -112,9 +112,9 @@ endif %?TOPDIR_P% ## 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; \ ## ## diff --git a/m4/Makefile.in b/m4/Makefile.in index ba1b463..c6b1340 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -244,9 +244,9 @@ distdir: $(DISTFILES) sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 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; \ for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4 index 4f1c96a..3e6a186 100644 --- a/m4/mkdirp.m4 +++ b/m4/mkdirp.m4 @@ -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 ]) diff --git a/tests/Makefile.in b/tests/Makefile.in index 9b5598a..24de387 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -858,9 +858,9 @@ distdir: $(DISTFILES) sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ 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; \ for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- 2.7.4