Attachment 45518 Details for Bug 36156 – Install xmlto output to $(htmldir) automatically

[patch] Install xmlto output to $(htmldir) automatically

0003-Install-xmlto-output-to-htmldir-automatically.patch (text/plain), 1.84 KB, created by Simon McVittie on 2011-04-12 05:21:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-04-12 05:21:14 UTC

Size: 1.84 KB

patch

obsolete

>From ff8131d11a54413d8af1556fe59c3630178b2f4c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 12 Apr 2011 13:01:44 +0100
>Subject: [PATCH 3/6] Install xmlto output to $(htmldir) automatically
>
>Also rename HTML_FILES to XMLTO_OUTPUT, as a more self-describing name:
>we have other HTML files which are not the output from xmlto.
>---
> doc/Makefile.am |   16 +++++++---------
> 1 files changed, 7 insertions(+), 9 deletions(-)
>
>diff --git a/doc/Makefile.am b/doc/Makefile.am
>index e402779..8af7faf 100644
>--- a/doc/Makefile.am
>+++ b/doc/Makefile.am
>@@ -48,17 +48,16 @@ EXTRA_DIST = \
> 
> html_DATA =
> 
>-HTML_FILES=					\
>+# we distribute these in the tarball so users don't necessarily need xmlto
>+dist_html_DATA = $(XMLTO_OUTPUT)
>+
>+XMLTO_OUTPUT=					\
> 	dbus-faq.html				\
> 	dbus-specification.html			\
> 	dbus-test-plan.html			\
> 	dbus-tutorial.html
> 
> if DBUS_XML_DOCS_ENABLED
>-all-local:: $(HTML_FILES)
>-
>-EXTRA_DIST += $(HTML_FILES)
>-
> dbus-specification.html: dbus-specification.xml
> 	$(XMLTO) html-nochunks $<
> 
>@@ -70,7 +69,6 @@ dbus-tutorial.html: dbus-tutorial.xml
> 
> dbus-faq.html: dbus-faq.xml
> 	$(XMLTO) html-nochunks $<
>-
> endif
> 
> if DBUS_DOXYGEN_DOCS_ENABLED
>@@ -117,11 +115,11 @@ BONUS_FILES = \
> 	$(top_srcdir)/COPYING \
> 	$(top_srcdir)/ChangeLog
> 
>-dbus-docs: $(STATIC_DOCS) $(HTML_FILES) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp
>+dbus-docs: $(STATIC_DOCS) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp
> 	$(AM_V_at)rm -rf $@
> 	$(AM_V_GEN)$(MKDIR_P) $@/api
> 	$(AM_V_at)cp $(STATIC_DOCS) $@
>-	$(AM_V_at)cp $(HTML_FILES) $@
>+	$(AM_V_at)cp $(dist_html_DATA) $@
> 	$(AM_V_at)cp $(MAN_HTML_FILES) $@
> 	$(AM_V_at)cp $(BONUS_FILES) $@
> 	$(AM_V_at)cp -r api/html $@/api
>@@ -156,4 +154,4 @@ clean-local:
> 	rm -f doxygen.stamp
> 
> maintainer-clean-local:
>-	rm -f $(HTML_FILES)
>+	rm -f $(XMLTO_OUTPUT)
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 36156: 45516 | 45517 | 45518 | 45519 | 45520 | 45521

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.