telepathy-logger: Use AC_PROG_MKDIR_P, MKDIR_P instead of deprecated AM_PROG_MKDIR_P, mkdir_p

Simon McVittie smcv at kemper.freedesktop.org
Thu Nov 7 19:41:30 CET 2013


Module: telepathy-logger
Branch: master
Commit: ece251a40c37483e20a4875f83e869c3309496cb
URL:    http://cgit.freedesktop.org/telepathy/telepathy-logger/commit/?id=ece251a40c37483e20a4875f83e869c3309496cb

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Oct 31 14:10:32 2013 +0000

Use AC_PROG_MKDIR_P, MKDIR_P instead of deprecated AM_PROG_MKDIR_P, mkdir_p

Similar to MC commit 04dd9b4.

(cherry picked from commit 6b05f8f7b39b2dd77f4e71447a633b568cb1311c)

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

---

 configure.ac           |    2 +-
 extensions/Makefile.am |    4 ++--
 tests/dbus/Makefile.am |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a629c52..60c8031 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
 AC_HEADER_STDC
 LT_INIT
-AM_PROG_MKDIR_P
+AC_PROG_MKDIR_P
 AM_PATH_GLIB_2_0
 AC_PATH_XTRA
 IT_PROG_INTLTOOL([0.35.0])
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index a7c263b..4f6c104 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -90,7 +90,7 @@ XSLTPROCFLAGS = --nonet --novalid
 # Generated files which can be generated for all categories simultaneously
 
 _gen/all.xml: all.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
-	$(mkdir_p) _gen
+	$(MKDIR_P) _gen
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
 
 doc/index.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
@@ -132,7 +132,7 @@ _gen/interfaces.h: _gen/all.xml \
 # although you can subdivide further if you want.
 
 _gen/misc.xml: misc.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
-	$(mkdir_p) _gen
+	$(MKDIR_P) _gen
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
 
 # do nothing, output as a side-effect
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index f0540cf..e0a8805 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -80,5 +80,5 @@ EXTRA_DIST = \
     $(NULL)
 
 dbus-1/%.conf: $(srcdir)/dbus-1/%.conf.in
-	$(AM_V_at)$(mkdir_p) dbus-1
+	$(AM_V_at)$(MKDIR_P) dbus-1
 	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@



More information about the telepathy-commits mailing list