Attachment 45517 Details for Bug 36156 – Install dbus.devhelp to $(htmldir), not $(apidir), and remove it in clean

[patch] Install dbus.devhelp to $(htmldir), not $(apidir), and remove it in clean

0002-Install-dbus.devhelp-to-htmldir-not-apidir-and-remov.patch (text/plain), 1.08 KB, created by Simon McVittie on 2011-04-12 05:20:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-04-12 05:20:58 UTC

Size: 1.08 KB

patch

obsolete

>From 289c9275a341d4a6bd4a3226744e12997d6f4f64 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 12 Apr 2011 12:54:22 +0100
>Subject: [PATCH 2/6] Install dbus.devhelp to $(htmldir), not $(apidir), and remove it in clean
>
>It needs to be in $(htmldir) so that its relative paths will work.
>---
> doc/Makefile.am |    5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
>diff --git a/doc/Makefile.am b/doc/Makefile.am
>index 11f756d..e402779 100644
>--- a/doc/Makefile.am
>+++ b/doc/Makefile.am
>@@ -46,6 +46,8 @@ EXTRA_DIST = \
> 	$(STATIC_DOCS) \
> 	$(MAN_IN_FILES)
> 
>+html_DATA =
>+
> HTML_FILES=					\
> 	dbus-faq.html				\
> 	dbus-specification.html			\
>@@ -79,7 +81,7 @@ doxygen.stamp: $(wildcard $(top_srcdir)/dbus/*.[ch])
> 	@touch $@
> 
> if DBUS_HAVE_XSLTPROC
>-api_DATA = dbus.devhelp
>+html_DATA += dbus.devhelp
> 
> dbus.devhelp: $(srcdir)/doxygen_to_devhelp.xsl doxygen.stamp
> 	$(XSLTPROC) -o $@ $< api/xml/index.xml
>@@ -147,6 +149,7 @@ maintainer-upload-docs:
> endif
> 
> clean-local:
>+	rm -f $(html_DATA)
> 	rm -rf api
> 	rm -rf dbus-docs
> 	rm -f *.1.html
>-- 
>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.