From 86f438759284c782b94c272e39dd921dd55b6cad Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Wed, 31 Dec 2014 14:48:44 +0100 Subject: [PATCH] attempt to remove pandoc dependency for "make install" from a dist tarball; @rubenk should i use build_dir or something in that test -e? --- docs/Makefile.am | 4 ++++ m4/pdns_check_pandoc.m4 | 1 + 2 files changed, 5 insertions(+) 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]) ]) -- 2.40.0