I'm checking this in.
2006-08-19 Alexandre Duret-Lutz <[EMAIL PROTECTED]>
* Makefile.am (maintainer-check): Check for mkdir_p.
* automake.texi (Obsolete macros): Document AM_PROG_MKDIR_P.
* lib/am/data.am, lib/am/distdir.am, lib/am/install.am,
lib/am/java.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am,
lib/am/mans.am, lib/am/progs.am, lib/am/python.am,
lib/am/scripts.am, lib/am/texinfos.am: Use MKDIR_P instead of mkdir_p.
* m4/mkdirp.m4 (AM_PROG_MKDIR_P): Define mkdir_p using $MKDIR_P, not
as '$(MKDIR_P)', otherwise it will break `Makefile.in's that use
mkdir_p without defining MKDIR_P.
* tests/distdir.test, tests/instman.test, tests/txinfo21.test:
Adjust.
Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.245
diff -u -r1.245 Makefile.am
--- Makefile.am 19 Aug 2006 15:07:40 -0000 1.245
+++ Makefile.am 19 Aug 2006 15:45:33 -0000
@@ -268,6 +268,10 @@
echo 'Do not use egrep or fgrep in the above files, they are not
portable.' 1>&2; \
exit 1; \
fi
+ @if grep 'mkdir_p' $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \
+ echo 'Do not use mkdir_p in the above files, use MKDIR_P.' 1>&2; \
+ exit 1; \
+ fi
## Try to make sure all @...@ substitutions are covered by our
## substitution rule.
@if test `grep -E '[EMAIL PROTECTED]@' aclocal | wc -l` -ne 0; then \
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.309
diff -u -r1.309 NEWS
--- NEWS 19 Aug 2006 13:58:03 -0000 1.309
+++ NEWS 19 Aug 2006 15:45:34 -0000
@@ -126,6 +126,13 @@
- Automake installs an "Hello World!" example package in $(docdir).
This example is used thorough the new "Autotools Introduction"
chapter of the manual.
+
+ - Automake now uses AC_PROG_MKDIR_P (new in Autoconf 2.60), and uses
+ $(MKDIR_P) instead of $(mkdir_p) to create directories. The
+ $(mkdir_p) variable is still defined (to the same value as
+ $(MKDIR_P)) but should be considered obsolete. If you are using
+ $(mkdir_p) in some of your rules, please plan to update them to
+ $(MKDIR_P) at some point.
New in 1.9:
Index: doc/automake.texi
===================================================================
RCS file: /cvs/automake/automake/doc/automake.texi,v
retrieving revision 1.145
diff -u -r1.145 automake.texi
--- doc/automake.texi 19 Aug 2006 13:53:52 -0000 1.145
+++ doc/automake.texi 19 Aug 2006 15:45:35 -0000
@@ -3886,6 +3886,33 @@
found in @file{<termios.h>}. This macro is obsolete, you should
use Autoconf's @code{AC_HEADER_TIOCGWINSZ} instead.
[EMAIL PROTECTED] AM_PROG_MKDIR_P
[EMAIL PROTECTED] AM_PROG_MKDIR_P
[EMAIL PROTECTED] @code{mkdir -p}, macro check
[EMAIL PROTECTED] MKDIR_P
[EMAIL PROTECTED] mkdir_p
+
+From Automake 1.8 to 1.9.6 this macro used to define the output
+variable @code{mkdir_p} to one of @code{mkdir -p}, @code{install.sh
+-d}, or @code{mkinstalldirs}.
+
+Nowadays Autoconf provides a similar functionality with
[EMAIL PROTECTED] (@pxref{Particular Programs, , Particular
+Program Checks, autoconf, The Autoconf Manual}), however this defines
+the output variable @code{MKDIR_P} instead. Therefore
[EMAIL PROTECTED] has been rewritten as a thin wrapper around
[EMAIL PROTECTED] to define @code{mkdir_p} to the same value as
[EMAIL PROTECTED] for backward compatibility.
+
+If you are using Automake, there is normally no reason to call this
+macro, because @code{AM_INIT_AUTOMAKE} already does so. However, make
+sure that the custom rules in your @file{Makefile}s use
[EMAIL PROTECTED](MKDIR_P)} and not @code{$(mkdir_p)}. Even if both variables
+still work, the latter should be considered obsolete.
+
+If you are not using Automake, please call @code{AC_PROG_MKDIR_P}
+instead of @code{AM_PROG_MKDIR_P}.
+
@item AM_SYS_POSIX_TERMIOS
@acindex AM_SYS_POSIX_TERMIOS
@cindex POSIX termios headers
Index: lib/am/data.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/data.am,v
retrieving revision 1.45
diff -u -r1.45 data.am
--- lib/am/data.am 14 May 2005 20:28:52 -0000 1.45
+++ lib/am/data.am 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004
+## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006
## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@
?!EXEC?.PHONY install-data-am: install-%DIR%%PRIMARY%
install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%)
@$(NORMAL_INSTALL)
- test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+ test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
?!BASE? @$(am__vpath_adj_setup) \
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
Index: lib/am/distdir.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.67
diff -u -r1.67 distdir.am
--- lib/am/distdir.am 4 Aug 2006 12:54:30 -0000 1.67
+++ lib/am/distdir.am 19 Aug 2006 15:45:36 -0000
@@ -107,7 +107,7 @@
## Make the subdirectories for the files.
##
case $$dist_files in \
- */*) $(mkdir_p) `echo "$$dist_files" | \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
@@ -165,7 +165,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -367,7 +367,7 @@
## $(distdir) is).
&& ({ \
## Build the directory, so we can cd into it even if `make install'
-## didn't create it. Use mkdir, not $(mkdir_p) because we want to
+## didn't create it. Use mkdir, not $(MKDIR_P) because we want to
## fail if the directory already exists (PR/413).
(cd ../.. && umask 077 && mkdir "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
Index: lib/am/install.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/install.am,v
retrieving revision 1.19
diff -u -r1.19 install.am
--- lib/am/install.am 14 May 2005 20:28:53 -0000 1.19
+++ lib/am/install.am 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
## ----------------------------------------- ##
## The reason we loop over %am__installdirs% (instead of simply running
-## `$(mkdir_p) %am__installdirs%') is that directories variable such as
+## `$(MKDIR_P) %am__installdirs%') is that directories variable such as
## `"$(DESTDIR)$(mydir)"' can potentially expand to `""' if `$(mydir)'
## is conditionally defined. BTW, those directories are quoted in
## order to support installation paths with spaces.
@@ -32,13 +32,13 @@
installdirs: installdirs-recursive
installdirs-am:%installdirs-local%
?am__installdirs? for dir in %am__installdirs%; do \
-?am__installdirs? test -z "$$dir" || $(mkdir_p) "$$dir"; \
+?am__installdirs? test -z "$$dir" || $(MKDIR_P) "$$dir"; \
?am__installdirs? done
else !%?SUBDIRS%
.PHONY: installdirs
installdirs:%installdirs-local%
?am__installdirs? for dir in %am__installdirs%; do \
-?am__installdirs? test -z "$$dir" || $(mkdir_p) "$$dir"; \
+?am__installdirs? test -z "$$dir" || $(MKDIR_P) "$$dir"; \
?am__installdirs? done
endif !%?SUBDIRS%
Index: lib/am/java.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/java.am,v
retrieving revision 1.25
diff -u -r1.25 java.am
--- lib/am/java.am 11 May 2006 17:25:41 -0000 1.25
+++ lib/am/java.am 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2001, 2003, 2004, 2006 Free Software
+## Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -47,7 +48,7 @@
?!EXEC?.PHONY install-data-am: install-%DIR%JAVA
install-%DIR%JAVA: class%DIR%.stamp
@$(NORMAL_INSTALL)
- test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+ test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
## A single .java file can be compiled into multiple .class files. So
## we just install all the .class files that got built into this
## directory. This is not optimal, but will have to do for now.
Index: lib/am/libs.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/libs.am,v
retrieving revision 1.29
diff -u -r1.29 libs.am
--- lib/am/libs.am 14 May 2005 20:28:53 -0000 1.29
+++ lib/am/libs.am 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004
+## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006
## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@
?!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES
install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+ test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
@list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
Index: lib/am/lisp.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/lisp.am,v
retrieving revision 1.47
diff -u -r1.47 lisp.am
--- lib/am/lisp.am 14 May 2005 20:28:53 -0000 1.47
+++ lib/am/lisp.am 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+## Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
@@ -90,7 +90,7 @@
@$(NORMAL_INSTALL)
## Do not install anything if EMACS was not found.
@if test "$(EMACS)" != no; then \
- test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"; \
+ test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"; \
?!BASE? $(am__vpath_adj_setup) \
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
Index: lib/am/ltlib.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/ltlib.am,v
retrieving revision 1.33
diff -u -r1.33 ltlib.am
--- lib/am/ltlib.am 13 Sep 2005 20:12:41 -0000 1.33
+++ lib/am/ltlib.am 19 Aug 2006 15:45:36 -0000
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005
-## Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004,
+## 2005, 2006 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
?!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES
install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+ test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
@list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
Index: lib/am/mans.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/mans.am,v
retrieving revision 1.30
diff -u -r1.30 mans.am
--- lib/am/mans.am 14 May 2005 20:28:53 -0000 1.30
+++ lib/am/mans.am 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998, 2001, 2003, 2004 Free Software Foundation, Inc.
+## Copyright (C) 1998, 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
.PHONY install-man: install-man%SECTION%
install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man%SECTION%dir)" || $(mkdir_p)
"$(DESTDIR)$(man%SECTION%dir)"
+ test -z "$(man%SECTION%dir)" || $(MKDIR_P)
"$(DESTDIR)$(man%SECTION%dir)"
@list='$(man%SECTION%_MANS) $(dist_man%SECTION%_MANS)
$(nodist_man%SECTION%_MANS)'; \
## Extract all items from man_MANS that should go in this section.
## This must be done dynamically to support conditionals.
Index: lib/am/progs.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/progs.am,v
retrieving revision 1.46
diff -u -r1.46 progs.am
--- lib/am/progs.am 14 May 2005 20:28:53 -0000 1.46
+++ lib/am/progs.am 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2006
## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
?!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS
install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+ test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
@list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
Index: lib/am/python.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/python.am,v
retrieving revision 1.25
diff -u -r1.25 python.am
--- lib/am/python.am 14 May 2005 20:28:53 -0000 1.25
+++ lib/am/python.am 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
+## Copyright (C) 1999, 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON
install-%DIR%PYTHON: $(%DIR%_PYTHON)
@$(NORMAL_INSTALL)
- test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+ test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
?!BASE? @$(am__vpath_adj_setup) \
?!BASE? list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
?BASE? @list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
Index: lib/am/scripts.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/scripts.am,v
retrieving revision 1.56
diff -u -r1.56 scripts.am
--- lib/am/scripts.am 14 May 2005 20:28:53 -0000 1.56
+++ lib/am/scripts.am 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004
+## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006
## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@
?!EXEC?.PHONY install-data-am: install-%DIR%SCRIPTS
install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+ test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)"
?!BASE? @$(am__vpath_adj_setup) \
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
Index: lib/am/texinfos.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.119
diff -u -r1.119 texinfos.am
--- lib/am/texinfos.am 12 Jan 2006 19:54:02 -0000 1.119
+++ lib/am/texinfos.am 19 Aug 2006 15:45:36 -0000
@@ -145,7 +145,7 @@
install-dvi-am: $(DVIS)
@$(NORMAL_INSTALL)
- test -z "$(dvidir)" || $(mkdir_p) "$(DESTDIR)$(dvidir)"
+ test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
@list='$(DVIS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -155,13 +155,13 @@
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
@list='$(HTMLS)'; for p in $$list; do \
if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
if test -d "$$d$$p"; then \
- echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
- $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
else \
@@ -172,7 +172,7 @@
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
- test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
+ test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
list='$(INFO_DEPS)'; \
for file in $$list; do \
@@ -232,7 +232,7 @@
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+ test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
@list='$(PDFS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -242,7 +242,7 @@
install-ps-am: $(PSS)
@$(NORMAL_INSTALL)
- test -z "$(psdir)" || $(mkdir_p) "$(DESTDIR)$(psdir)"
+ test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
@list='$(PSS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
Index: m4/mkdirp.m4
===================================================================
RCS file: /cvs/automake/automake/m4/mkdirp.m4,v
retrieving revision 1.12
diff -u -r1.12 mkdirp.m4
--- m4/mkdirp.m4 19 Aug 2006 13:58:03 -0000 1.12
+++ m4/mkdirp.m4 19 Aug 2006 15:45:36 -0000
@@ -11,5 +11,9 @@
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_PREREQ([2.60])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.
+dnl We now use MKDIR_P, while keeping a definition of mkdir_p for
+dnl backward compatibility. Do not define mkdir_p as $(MKDIR_P) for
+dnl the sake of Makefile.ins that do not define MKDIR_P.
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
])
Index: tests/distdir.test
===================================================================
RCS file: /cvs/automake/automake/tests/distdir.test,v
retrieving revision 1.11
diff -u -r1.11 distdir.test
--- tests/distdir.test 4 Aug 2006 12:54:30 -0000 1.11
+++ tests/distdir.test 19 Aug 2006 15:45:36 -0000
@@ -54,11 +54,11 @@
rm -rf distdir-1.0
# Remove the dot from VERSION for the next grep.
-VERSION=10 mkdir_p='echo mkdir_p' $MAKE -e distdir >make.log || :
+VERSION=10 MKDIR_P='echo MKDIR_P' $MAKE -e distdir >make.log || :
# Make sure no `./' appear in the directory names. srcdir is `..', so
# this also checks that no directory is created in the source tree.
-grep 'mkdir_p.*\.' make.log && exit 1
+grep 'MKDIR_P.*\.' make.log && exit 1
cd ..
./configure --prefix `pwd`
Index: tests/instman.test
===================================================================
RCS file: /cvs/automake/automake/tests/instman.test,v
retrieving revision 1.8
diff -u -r1.8 instman.test
--- tests/instman.test 14 May 2005 20:28:55 -0000 1.8
+++ tests/instman.test 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2001, 2002, 2003, 2006 Free Software
+# Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -18,19 +19,23 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-# Test to make sure mkdir_p invocation correct in install-man
+# Make sure the MKDIR_P invocation is correct in install-man
# target. Bug reported by Gordon Irlam <[EMAIL PROTECTED]>.
. ./defs || exit 1
+set -e
+
+echo AC_OUTPUT >> configure.in
+
cat > Makefile.am << 'EOF'
man_MANS = frob.8
EOF
: > frob.8
-$ACLOCAL || exit 1
-$AUTOMAKE || exit 1
+$ACLOCAL
+$AUTOMAKE
-grep '[^(/]mkdir_p' Makefile.in > out || exit 1
+grep '[^(/]MKDIR_P' Makefile.in > out
test `wc -l < out` -eq 1
Index: tests/txinfo21.test
===================================================================
RCS file: /cvs/automake/automake/tests/txinfo21.test,v
retrieving revision 1.5
diff -u -r1.5 txinfo21.test
--- tests/txinfo21.test 14 May 2005 20:28:56 -0000 1.5
+++ tests/txinfo21.test 19 Aug 2006 15:45:36 -0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -77,7 +77,7 @@
info_TEXINFOS = main3.texi
install-pdf-local:
- @$(mkdir_p) "$(pdfdir)"
+ @$(MKDIR_P) "$(pdfdir)"
:> "$(pdfdir)/hello"
uninstall-local:
rm -f "$(pdfdir)/hello"
--
Alexandre Duret-Lutz
Shared books are happy books. http://www.bookcrossing.com/friend/gadl
