* 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.

diff --git a/ChangeLog b/ChangeLog
index aa6ccaefdf8d3233d20641a1e363888f64f8fca4..265001ffe13a2e4aca9d37b3a955ab3dcbe412df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-24  Stepan Kasal  <kasal@ucw.cz>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * 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  <eric@debian.org>
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/Makefile.in b/Makefile.in
index 26c11f6fa29c06517b212d612dc8377e66e2666c..d4e4d913aefcf7528074563cc37d299624a6c05b 100644 (file)
--- 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 179cdec7d9783ff30120a97e47cf37bed380976b..ced36a0aed5cbb8eba8855e4e33b8e9d9f8177d9 100644 (file)
--- 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 4f76829b3cbcc422da96fb0f7175f457d666de8c..7f91cbad3074c452e846cb7eb6cca436edd3bc5a 100755 (executable)
--- 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 06a04e2e3ea77f6aacbb91f6aa687b606ef1641e..3dcdcd09bb97fb60449bda6aa02fda318d818ab4 100644 (file)
--- 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 c5c587fe7f2640078cd949b8c5e453e23ef07351..4bbea3f2acaf1d5174973db21d2143643d817378 100644 (file)
--- 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 516571e965e5617b71c2c5fe13a5280dea0c876e..0926c81d1595a9fd71cc73e5ebe046593f5c0307 100644 (file)
--- 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 80b178edb49c5294ff593699e6c04b8c26eb7bbb..50211f85a43fc84073965c2d43762000d8b13457 100644 (file)
--- 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 ff695856ae7ededc14ec2139a3647138a453533d..1f2db951088b556b3f09f21aa2740579692dcd31 100644 (file)
--- 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 27d52fcdfcc17f2ae56d8526336f84e690cc544d..6a954d5bfa217f883dd81703c864289f6b29f21e 100644 (file)
--- 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 ba1b463eaee93fa128ee7aa4d2f79e86a1c4a94c..c6b1340fda73e121952b6055ac5f539e9772be11 100644 (file)
--- 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 4f1c96aa4f76036d71296ee246c8b78af7f85dff..3e6a186a41b9963de01501f11eb32e5f15a84d7d 100644 (file)
--- 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 9b5598a26f56560fbd3b7dec9366393a95af421d..24de387d9bfe58b6e154d452b95a29880cb2ec81 100644 (file)
--- 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; \