From 88566ea3b3d41cfbb0b11ffe3c9d202a82e9187a Mon Sep 17 00:00:00 2001 From: You-Sheng Yang Date: Wed, 31 Dec 2014 01:23:12 +0800 Subject: [PATCH] docs: fix out-of-tree build When compiling NetworkManager with --enable-gtk-doc outside the source tree, the generated documents are slightly different from those generated in tree. This patch fixes that missed COPYING file in $(top_builddir) and adds $(top_builddir)/libnm-util to DOC_SOURCE_DIR. https://bugzilla.gnome.org/show_bug.cgi?id=742139 Signed-off-by: You-Sheng Yang (cherry picked from commit 738649c1d5fe28f487cb5158398a0688467d8513) --- docs/api/Makefile.am | 1 + docs/libnm-util/Makefile.am | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 5283f73f72..1b50d02b65 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -59,6 +59,7 @@ MKHTML_OPTIONS=--path="$(abs_srcdir)" content_files = \ version.xml \ migrating-to-09.xml \ + ../../COPYING \ $(NULL) include $(top_srcdir)/gtk-doc.make diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index f5c44ace85..17022310c1 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -10,7 +10,9 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # The directory containing the source code. Relative to $(srcdir). # gtk-doc will search all .c & .h files beneath here for inline comments # documenting functions and macros. -DOC_SOURCE_DIR=$(top_srcdir)/libnm-util +DOC_SOURCE_DIR= \ + $(top_builddir)/libnm-util \ + $(top_srcdir)/libnm-util # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--rebuild-types --rebuild-sections