Re: GNU Automake 1.12.1 released

[Stefano Lattarini]

On 07/06/2012 01:05 PM, Stefano Lattarini wrote:
>
> Grrr, the second patch doesn't work on systems (like NetBSD 5.1) where
> "mkdir -p" is not deemed good enough, and "install-sh -d" is used
> instead:
>    [SNIP]
> Anyway, I've verified that this is *not* a regression (at least w.r.t
> Automake 1.11.2), so I'll simply adjust the tests accordingly (using
> $(mkdir_p) in a $(SUBDIR) Makefile, instead of fooling around with
> chdir in make recipes).
> 
> I'll post the adjusted patch soon.

Here it is what should be squashed into the first patch.  The updated
patch is also attached, for reference.  I will push soon if there is no
objection.

Regards,
  Stefano

-*-*-*-

diff --git a/t/mkdir_p.sh b/t/mkdir_p.sh
index 9f03cf5..ff0cb8f 100755
--- a/t/mkdir_p.sh
+++ b/t/mkdir_p.sh
@@ -19,26 +19,34 @@

 . ./defs || exit 1

-echo AC_OUTPUT >> configure.ac
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END

 cat > Makefile.am << 'END'
-.PHONY: test
-check-local: test
-test:
+SUBDIRS = sub
+all-local:
        $(mkdir_p) . dir1/dir2
-## $(mkdir_p) should continue to work even if we chdir around.
-       (mkdir x && cd x && $(mkdir_p) .. y/z ../foo)
-       test -d foo
+check-local: all
        test -d dir1/dir2
-       test -d x/y/z
+       test -d dir1/dir3
+END
+
+mkdir sub
+cat > sub/Makefile.am << 'END'
+# '$(mkdir_p)' should continue to work even in subdir makefiles.
+all-local:
+       $(mkdir_p) .. ../dir1/dir3
 END

 $ACLOCAL
-$AUTOCONF -Werror -Wobsolete
+$AUTOCONF -Werror -Wall
 $AUTOMAKE

 ./configure
-$MAKE test
+$MAKE check-local
 $MAKE distcheck

 :
diff --git a/t/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh
index 9f41250..0257391 100755
--- a/t/mkdirp-deprecation.sh
+++ b/t/mkdirp-deprecation.sh
@@ -22,19 +22,24 @@

 cat >> configure.ac << 'END'
 AM_PROG_MKDIR_P
+AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT
 END

 cat > Makefile.am << 'END'
-.PHONY: test
-check-local: test
-test:
+SUBDIRS = sub
+all-local:
        $(mkdir_p) . dir1/dir2
-## $(mkdir_p) should continue to work even if we chdir around.
-       (mkdir x && cd x && $(mkdir_p) .. y/z ../foo)
-       test -d foo
+check-local: all
        test -d dir1/dir2
-       test -d x/y/z
+       test -d dir1/dir3
+END
+
+mkdir sub
+cat > sub/Makefile.am << 'END'
+# '$(mkdir_p)' should continue to work even in subdir makefiles.
+all-local:
+       $(mkdir_p) .. ../dir1/dir3
 END

 grep_err ()
@@ -61,7 +66,7 @@ grep_err
 $AUTOMAKE -Wno-obsolete

 ./configure
-$MAKE test
+$MAKE check-local
 $MAKE distcheck

 :

0001-coverage-test-that-AM_PROG_MKDIR_P-and-mkdir_p-still.patch
Description: Text Data