From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Wed, 31 Dec 2014 13:48:44 +0000 (+0100)
Subject: attempt to remove pandoc dependency for "make install" from a dist tarball; @rubenk... 
X-Git-Tag: rec-3.7.0-rc1~67^2~13^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86f438759284c782b94c272e39dd921dd55b6cad;p=pdns

attempt to remove pandoc dependency for "make install" from a dist tarball; @rubenk should i use build_dir or something in that test -e?
---

diff --git a/docs/Makefile.am b/docs/Makefile.am
index d62e76378..3c4a22d28 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -11,6 +11,10 @@ MANPAGES_TARGET = dnsdist.1 \
 
 if HAVE_PANDOC
 man_MANS = $(MANPAGES_TARGET)
+else
+if HAVE_MANPAGES
+dist_man_MANS = $(MANPAGES_TARGET)
+endif
 endif
 
 EXTRA_DIST = manpages \
diff --git a/m4/pdns_check_pandoc.m4 b/m4/pdns_check_pandoc.m4
index 12ab3f423..16443b1c6 100644
--- a/m4/pdns_check_pandoc.m4
+++ b/m4/pdns_check_pandoc.m4
@@ -7,4 +7,5 @@ AC_DEFUN([PDNS_CHECK_PANDOC], [
     )
   ])
   AM_CONDITIONAL([HAVE_PANDOC], [test "x$PANDOC" != "xno"])
+  AM_CONDITIONAL([HAVE_MANPAGES], [test -e docs/pdns_server.1])
 ])