From b599f1b74353e61ad127181039a1c10945a3f10e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 13 Feb 2017 16:26:20 +0100 Subject: build: combine handling of setting docs and man pages Building the man pages via xsltproc requires "docbook.xsl" which is part of docbook. Previously, we would build the man pages solely based on "--enable-introspection", which checks for the presence of xsltproc, but not docbook. This can lead to build failure when docbook is not available, but "--enable-introspection" is given. Instead of adding yet another configure option to fine-tune and say "--with-docbook --disable-gtk-doc", just simplify it. Now, documentation (both man pages and setting docs) will be generated with "--enable-gtk-doc" and "--enable-introspection". If the documentation is not about to be generated, pre-generated docs will be installed if they are available. That is commonly the case with a source tarball, but not with a git checkout. Finally, if documentation is nither generated nor pre-generated, no documentation will be installed *duh*. This removes the possibility to treat man pages separate from settings docs. Now you either generate both, install both pre-generated, or don't get any of them. https://bugzilla.gnome.org/show_bug.cgi?id=778551 --- docs/api/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index bb54fb35ea..91bd612874 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -5,7 +5,7 @@ XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) GENERATED_FILES = -if SETTING_DOCS_AVAILABLE +if BUILD_DOCS settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-settings-docs.xml $(AM_V_GEN) xsltproc --output $@ $^ -- cgit v1.2.1