docs: fix out-of-tree build
authorYou-Sheng Yang <vicamo@gmail.com>
Tue, 30 Dec 2014 17:23:12 +0000 (01:23 +0800)
committerThomas Haller <thaller@redhat.com>
Sat, 3 Jan 2015 12:12:44 +0000 (13:12 +0100)
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 <vicamo@gmail.com>
docs/api/Makefile.am
docs/libnm-util/Makefile.am

index 5283f73..1b50d02 100644 (file)
@@ -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
index f5c44ac..1702231 100644 (file)
@@ -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