summaryrefslogtreecommitdiff
path: root/t/mkdir_p.sh
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-07-09 10:33:49 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-07-09 12:10:25 +0200
commit25510217c2844deccf469db8dc2b1f03072e858c (patch)
treea9ed0055966c3524635e3593a010099db1c89e54 /t/mkdir_p.sh
parent3187debeb65ca767511cbc1720551c8db4b8e577 (diff)
downloadautomake-25510217c2844deccf469db8dc2b1f03072e858c.tar.gz
compat: automake should substitute @mkdir_p@, for backward compatibility
That has been unwittingly broken by commit v1.12-19-g7a1eb9f of 2012-04-28, "AM_PROG_MKDIR_P: deprecate, to be removed in Automake 1.13". We thought it wasn't a big deal, but Jim Meyering reported that @mkdir_p@ is used in gettext's Makefile.in.in template: <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> * lib/am/header-vars.am (mkdir_p): Don't define. * m4/init.m4 (AM_INIT_AUTOMAKE): AC_SUBST 'mkdir_p' with $(MKDIR_P). * t/mkdir_p.sh, t/mkdirp-deprecation.sh: Enhance. * NEWS: Update. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/mkdir_p.sh')
-rwxr-xr-xt/mkdir_p.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/t/mkdir_p.sh b/t/mkdir_p.sh
index 624365c2d..2cc68a3d5 100755
--- a/t/mkdir_p.sh
+++ b/t/mkdir_p.sh
@@ -27,17 +27,21 @@ END
cat > Makefile.am << 'END'
SUBDIRS = sub
all-local:
- $(mkdir_p) . dir1/dir2
+ $(mkdir_p) . dir1/a
+ @mkdir_p@ . dir2/b
check-local: all
- test -d dir1/dir2
- test -d dir1/dir3
+ test -d dir1/a
+ test -d dir2/b
+ test -d dir3/c
+ test -d dir3/d
END
mkdir sub
cat > sub/Makefile.am << 'END'
# '$(mkdir_p)' should continue to work even in subdir makefiles.
all-local:
- $(mkdir_p) .. ../dir1/dir3
+ $(mkdir_p) .. ../dir3/c
+ @mkdir_p@ .. ../dir3/d
END
$ACLOCAL