[next] telepathy-mission-control: Use AC_PROG_MKDIR_P and MKDIR_P instead of AM_PROG_MKDIR_P and mkdir_p

[Simon McVittie]

Module: telepathy-mission-control
Branch: next
Commit: 04dd9b4c9c877a9d2be838101c19ae096277c692
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=04dd9b4c9c877a9d2be838101c19ae096277c692

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 26 20:20:37 2013 +0100

Use AC_PROG_MKDIR_P and MKDIR_P instead of AM_PROG_MKDIR_P and mkdir_p

The latter are deprecated, and recent Automake makes a lot of noise
about them.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69885
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 configure.ac                    |    2 +-
 src/Makefile.am                 |    8 ++++----
 tests/twisted/tools/Makefile.am |    8 ++++----
 tools/lcov.am                   |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index ef7985e..2fdff02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
-AM_PROG_MKDIR_P
+AC_PROG_MKDIR_P
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS([sys/stat.h sys/types.h sysexits.h])
diff --git a/src/Makefile.am b/src/Makefile.am
index c51a58a..17f644e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -225,12 +225,12 @@ Android.mk: Makefile.am $(nodist_libmcd_convenience_la_SOURCES)
 tools_dir = $(top_srcdir)/tools
 
 _gen/mcd.xml: mcd.xml $(wildcard $(top_srcdir)/xml/*.xml)
-	$(AM_V_at)$(mkdir_p) _gen
+	$(AM_V_at)$(MKDIR_P) _gen
 	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
 		$< > $@
 
 _gen/%.xml: $(top_srcdir)/xml/%.xml $(wildcard $(top_srcdir)/xml/*.xml)
-	$(AM_V_at)$(mkdir_p) _gen
+	$(AM_V_at)$(MKDIR_P) _gen
 	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
 		$< > $@
 
@@ -287,12 +287,12 @@ _gen/gtypes.h _gen/gtypes-body.h: _gen/mcd.xml \
 # like account, account-manager, ...)
 
 _gen/%.xml: $(top_srcdir)/xml/%.xml $(wildcard $(top_srcdir)/xml/*.xml) Makefile.am
-	$(AM_V_at)$(mkdir_p) _gen
+	$(AM_V_at)$(MKDIR_P) _gen
 	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
 		$< > $@
 
 _gen/%.xml: %.xml $(wildcard $(top_srcdir)/xml/*.xml) Makefile.am
-	$(AM_V_at)$(mkdir_p) _gen
+	$(AM_V_at)$(MKDIR_P) _gen
 	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
 		$< > $@
 
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index ffe04ef..9eb17c7 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -27,25 +27,25 @@ run-mc.sh: run-mc.sh.in Makefile
 	@chmod +x $@
 
 servicedir-uninstalled/%.conf: servicedir-uninstalled/%.conf.in Makefile
-	$(AM_V_at)$(mkdir_p) servicedir-uninstalled
+	$(AM_V_at)$(MKDIR_P) servicedir-uninstalled
 	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
 
 servicedir-installed/%.conf: servicedir-installed/%.conf.in Makefile
-	$(AM_V_at)$(mkdir_p) servicedir-installed
+	$(AM_V_at)$(MKDIR_P) servicedir-installed
 	$(AM_V_GEN)sed -e "s|[@]mctestsdir[@]|@mctestsdir@|g" $< > $@
 
 # We don't use the full filename for the .in because > 99 character filenames
 # in tarballs are non-portable (and automake 1.8 doesn't let us build
 # non-archaic tarballs)
 servicedir-uninstalled/org.freedesktop.Telepathy.%.service: servicedir-uninstalled/%.service.in Makefile
-	$(AM_V_at)$(mkdir_p) servicedir-uninstalled
+	$(AM_V_at)$(MKDIR_P) servicedir-uninstalled
 	$(AM_V_GEN)sed \
 		-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" \
 		-e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
 		$< > $@
 
 servicedir-installed/org.freedesktop.Telepathy.%.service: servicedir-installed/%.service.in Makefile
-	$(AM_V_at)$(mkdir_p) servicedir-installed
+	$(AM_V_at)$(MKDIR_P) servicedir-installed
 	$(AM_V_GEN)sed \
 		-e "s|[@]mctestsdir[@]|@mctestsdir@|g" \
 		$< > $@
diff --git a/tools/lcov.am b/tools/lcov.am
index a5feb72..298e091 100644
--- a/tools/lcov.am
+++ b/tools/lcov.am
@@ -8,7 +8,7 @@ lcov-report:
 		--remove @top_builddir@/lcov.info.tmp \
 		'doc/reference/*/*-scan.c'
 	rm @top_builddir@/lcov.info.tmp
-	$(mkdir_p) @top_builddir@/lcov.html
+	$(MKDIR_P) @top_builddir@/lcov.html
 	git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\
 	genhtml --title "@PACKAGE_STRING@ $$git_commit" \
 		--output-directory @top_builddir@/lcov.html lcov.info