[libxml2] Switch from the obsolete mkinstalldirs to AC_PROG_MKDIR_P
- From: Daniel Veillard <veillard src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] Switch from the obsolete mkinstalldirs to AC_PROG_MKDIR_P
- Date: Thu, 4 Nov 2010 09:01:17 +0000 (UTC)
commit 64b0d60c2872ed6c788dd245b92dea95c095b8a3
Author: Adrian Bunk <bunk stusta de>
Date: Thu Nov 4 09:43:31 2010 +0100
Switch from the obsolete mkinstalldirs to AC_PROG_MKDIR_P
This was obsoleted in 2005 so we should be safe.
But keep AC_PREREQ to 2.59 as it's still widely deployed.
Makefile.am | 4 +-
config.h.in | 3 +
configure.in | 2 +
doc/Makefile.am | 10 ++--
doc/devhelp/Makefile.am | 2 +-
doc/examples/Makefile.am | 2 +-
include/libxml/Makefile.am | 3 -
mkinstalldirs | 162 --------------------------------------------
8 files changed, 14 insertions(+), 174 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 967afbd..b8cbb4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1213,9 +1213,9 @@ DOC_MODULE=libxml2-$(VERSION)
EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
+ @MKDIR_P@ $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
- INSTALL@ -m 0644 $(srcdir)/Copyright $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
- $(mkinstalldirs) $(DESTDIR)$(EXAMPLES_DIR)
+ @MKDIR_P@ $(DESTDIR)$(EXAMPLES_DIR)
- INSTALL@ -m 0644 $(srcdir)/xmllint.c $(DESTDIR)$(EXAMPLES_DIR)
- INSTALL@ -m 0644 $(srcdir)/testSAX.c $(DESTDIR)$(EXAMPLES_DIR)
- INSTALL@ -m 0644 $(srcdir)/testHTML.c $(DESTDIR)$(EXAMPLES_DIR)
diff --git a/config.h.in b/config.h.in
index 6f45c6c..d60f362 100644
--- a/config.h.in
+++ b/config.h.in
@@ -274,6 +274,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff --git a/configure.in b/configure.in
index 17c11cd..e6b6578 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.59)
AC_INIT(entities.c)
AM_CONFIG_HEADER(config.h)
AC_CONFIG_MACRO_DIR([m4])
@@ -52,6 +53,7 @@ AM_INIT_AUTOMAKE(libxml2, $VERSION)
dnl Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
+AC_PROG_MKDIR_P
AC_PROG_CPP
AC_PATH_PROG(RM, rm, /bin/rm)
AC_PATH_PROG(MV, mv, /bin/mv)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4f8e010..cf1ee7c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -111,18 +111,18 @@ maintainer-clean-local: clean-local
rebuild: api all
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
+ @MKDIR_P@ $(DESTDIR)$(HTML_DIR)
- INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif $(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR)
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
+ @MKDIR_P@ $(DESTDIR)$(HTML_DIR)/html
- INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(HTML_DIR)/html
- INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(HTML_DIR)/html
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial
+ @MKDIR_P@ $(DESTDIR)$(HTML_DIR)/tutorial
- INSTALL@ -m 0644 $(srcdir)/tutorial/*.* \
$(DESTDIR)$(HTML_DIR)/tutorial
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial/images
+ @MKDIR_P@ $(DESTDIR)$(HTML_DIR)/tutorial/images
- INSTALL@ -m 0644 $(srcdir)/tutorial/images/*.* \
$(DESTDIR)$(HTML_DIR)/tutorial/images
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial/images/callouts
+ @MKDIR_P@ $(DESTDIR)$(HTML_DIR)/tutorial/images/callouts
- INSTALL@ -m 0644 $(srcdir)/tutorial/images/callouts/*.* \
$(DESTDIR)$(HTML_DIR)/tutorial/images/callouts
diff --git a/doc/devhelp/Makefile.am b/doc/devhelp/Makefile.am
index 0200e3e..36852f9 100644
--- a/doc/devhelp/Makefile.am
+++ b/doc/devhelp/Makefile.am
@@ -66,7 +66,7 @@ libxml2.devhelp $(HTML_FILES): devhelp.xsl html.xsl $(top_srcdir)/doc/libxml2-ap
$(XSLTPROC) --nonet -o $(srcdir)/libxml2.devhelp devhelp.xsl $(top_srcdir)/doc/libxml2-api.xml ; fi );
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR)
+ - MKDIR_P@ $(DESTDIR)$(DEVHELP_DIR)
- INSTALL@ -m 0644 $(srcdir)/libxml2.devhelp $(DESTDIR)$(DEVHELP_DIR)
- INSTALL@ -m 0644 $(EXTRA_FORMAT:%=$(srcdir)/%) $(DESTDIR)$(DEVHELP_DIR)
- INSTALL@ -m 0644 $(HTML_FILES:%=$(srcdir)/%) $(DESTDIR)$(DEVHELP_DIR)
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index d1beee5..bdac7bb 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -12,7 +12,7 @@ index.html: examples.xml examples.xsl
-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" && xmllint --valid --noout index.html)
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
+ @MKDIR_P@ $(DESTDIR)$(HTML_DIR)
- INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
EXTRA_DIST=examples.xsl index.py examples.xml writer.xml test3.xml tst.xml test1.xml test2.xml io2.res xpath2.res tree1.res reader4.res io1.res tree2.res reader3.res xpath1.res reader1.res
diff --git a/include/libxml/Makefile.am b/include/libxml/Makefile.am
index bf03a3b..cf9297a 100644
--- a/include/libxml/Makefile.am
+++ b/include/libxml/Makefile.am
@@ -51,7 +51,4 @@ xmlinc_HEADERS = \
xmlsave.h \
schematron.h
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(xmlincdir)
-
EXTRA_DIST = xmlversion.h.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]