From 6c2f416a2dfedb333ec272bde6587a3eb4257139 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Sat, 1 Oct 2016 21:23:16 +0200 Subject: [PATCH] doc: Install introspection and busconfig DTDs Install them to $(datadir)/xml/dbus-1, which seems to be the standard location for installed DTDs. This means that developers can use them to validate their introspection XML, and sysadmins can use them to validate their bus configuration files. https://bugs.freedesktop.org/show_bug.cgi?id=89011 --- doc/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 8bc85c5..9ccca1b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -24,6 +24,9 @@ DTDS = \ busconfig.dtd \ introspect.dtd +dtddir = $(datadir)/xml/dbus-1 +dist_dtd_DATA = $(DTDS) + dist_doc_DATA = system-activation.txt # uploaded and distributed, but not installed @@ -34,8 +37,7 @@ STATIC_DOCS = \ dbus-tutorial.xml \ dbus-api-design.duck \ dcop-howto.txt \ - introspect.xsl \ - $(DTDS) + introspect.xsl EXTRA_DIST = \ file-boilerplate.c \ @@ -141,10 +143,11 @@ BONUS_FILES = \ $(top_srcdir)/COPYING \ $(top_srcdir)/ChangeLog -dbus-docs: $(STATIC_DOCS) $(MAN_XML_FILES) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(XMLTO_HTML) $(YELP_HTML) $(YELP_STATIC_HTML) +dbus-docs: $(STATIC_DOCS) $(DTDS) $(MAN_XML_FILES) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(XMLTO_HTML) $(YELP_HTML) $(YELP_STATIC_HTML) $(AM_V_at)rm -rf $@ $@.tmp $(AM_V_GEN)$(MKDIR_P) $@.tmp/api $(AM_V_at)cd $(srcdir) && cp $(STATIC_DOCS) @abs_builddir@/$@.tmp + $(AM_V_at)cd $(srcdir) && cp $(DTDS) @abs_builddir@/$@.tmp $(AM_V_at)cd $(srcdir) && cp $(dist_doc_DATA) @abs_builddir@/$@.tmp $(AM_V_at)cd $(srcdir) && cp $(STATIC_HTML) @abs_builddir@/$@.tmp $(AM_V_at)cp $(XMLTO_HTML) @abs_builddir@/$@.tmp -- 2.7.4