summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2013-11-16 16:51:27 +0100
committerThomas Haller <thaller@redhat.com>2013-11-18 19:19:13 +0100
commit044cebade409fa2a19f7744a0693046459538f92 (patch)
tree9e6a2eb9e2b44913f96560b4f14ff008866f38bb
parent63d486b4de0e48a183025e98f7d20fb3912c6911 (diff)
downloadNetworkManager-044cebade409fa2a19f7744a0693046459538f92.tar.gz
build: fix for `make distcheck` without enable-gtk-doc
Without this patch, the following fails with a rather obscure message about missing make target. ./autogen.sh && make && make distcheck ... *** No rule to make target `NetworkManager.8', needed by `distdir'. Stop. Swap the order of the subdirectories 'docs' and 'man' to build 'docs' earlier. This way, `make distcheck` fails in the directory 'docs' with a better error message: *** gtk-doc must be installed and enabled in order to make dist Also, add 'man/nmcli-examples.5' to the list of files, to determine whether to use the pre generated doc files. Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 0fb1b9af0b..ebaad4bd55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,8 +14,8 @@ SUBDIRS = \
data \
test \
po \
- man \
docs \
+ man \
examples \
vapi
diff --git a/configure.ac b/configure.ac
index be15f7986a..751072e532 100644
--- a/configure.ac
+++ b/configure.ac
@@ -688,6 +688,7 @@ install_pregen_manpages=no
if test "$enable_gtk_doc" != "yes" \
-a -f man/NetworkManager.conf.5 \
-a -f man/nm-settings.5 \
+ -a -f man/nmcli-examples.5 \
-a -f man/NetworkManager.8; then
install_pregen_manpages=yes
fi