Attachment 124520 Details for Bug 96520 – [PATCH] build: Fix gtk-doc build when srcdir != builddir

[patch] [PATCH] build: Fix gtk-doc build when srcdir != builddir

0001-build-Fix-gtk-doc-build-when-srcdir-builddir.patch (text/plain), 1.26 KB, created by Ting-Wei Lan on 2016-06-14 02:41:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ting-Wei Lan

Created: 2016-06-14 02:41:59 UTC

Size: 1.26 KB

patch

obsolete

>From 39f8933e46b8266a5994a0c173455b367cb903f0 Mon Sep 17 00:00:00 2001
>From: Ting-Wei Lan <lantw@src.gnome.org>
>Date: Tue, 14 Jun 2016 10:31:27 +0800
>Subject: [PATCH] build: Fix gtk-doc build when srcdir != builddir
>
>https://bugs.freedesktop.org/show_bug.cgi?id=96520
>---
> doc/api/Makefile.am | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
>index 3b2a103..cd62037 100644
>--- a/doc/api/Makefile.am
>+++ b/doc/api/Makefile.am
>@@ -13,7 +13,7 @@ DOC_MAIN_SGML_FILE=colord-docs.xml
> SCAN_OPTIONS=--ignore-headers=config.h
> 
> # The directory containing the source code. Relative to $(srcdir)
>-DOC_SOURCE_DIR=../../lib/colord
>+DOC_SOURCE_DIR=$(top_srcdir)/lib/colord $(top_builddir)/lib/colord
> 
> # Used for dependencies
> HFILE_GLOB=
>@@ -23,6 +23,9 @@ CFILE_GLOB=
> IGNORE_HFILES= \
> 	config.h
> 
>+# Extra options to supply to gtkdoc-mkhtml
>+MKHTML_OPTIONS=--path="$(top_srcdir)"
>+
> # CFLAGS and LDFLAGS for compiling scan program. Only needed
> # if $(DOC_MODULE).types is non-empty.
> AM_CPPFLAGS = \
>@@ -46,6 +49,7 @@ MKTMPL_OPTIONS=
> 
> # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
> content_files =  				\
>+	../../COPYING				\
> 	version.xml				\
> 	dbus/org.freedesktop.ColorManager.ref.xml
> 
>-- 
>2.5.5
>

Actions: View | Splinter Review

Attachments on bug 96520: 124520

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.