Add manpage to distribution

Improve readibility of populate

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index c9d2ef7d0a951c990b4618e04f237a7ea9f5a055..93a802db845463d078402c00c6225cb4d8bc373b 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -10,7 +10,13 @@ BUILT_SOURCES=htmlfiles.h
 htmlfiles.h: html/*
        ./incfiles > $@
 
-EXTRA_DIST=dnslabeltext.rl dnsdistconf.lua README.md html
+man_MANS=dnsdist.1
+
+EXTRA_DIST=dnslabeltext.rl \
+          dnsdistconf.lua \
+          README.md \
+          html \
+          dnsdist.1
 
 bin_PROGRAMS = dnsdist
 dnsdist_SOURCES = \

diff --git a/pdns/dnsdistdist/populate b/pdns/dnsdistdist/populate
index cbe0b1f5e5101e14b11ba7a538657abbf3760fd4..59c7b633f6a86860ed46dad005787576724b6e73 100755 (executable)
--- a/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e
+set -x
+
 ln -fs ../base32.hh ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc ../dns.hh \
 ../dnslabeltext.rl ../dnsname.cc ../dnsname.hh ../dnsparser.hh ../dnsrulactions.hh ../dnswriter.cc ../dnswriter.hh \
 ../dolog.hh ../iputils.cc ../iputils.hh ../misc.cc ../misc.hh ../namespaces.hh \
@@ -7,20 +10,24 @@ ln -fs ../base32.hh ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc .
 ../dnsdist-web.cc ../sstuff.hh ../dnsdist-tcp.cc .
 
 ln -fs ../README-dnsdist.md README.md
-
 ln -fs ../dnsdistconf.lua .
+
 mkdir -p pdns/ext/luawrapper/include
-mkdir -p pdns/ext/yahttp/yahttp
-mkdir -p pdns/ext/json11
-mkdir -p pdns/ext/incbin
 ln -sf ../../../../../ext/luawrapper/include/LuaContext.hpp pdns/ext/luawrapper/include
-ln -sf ../../../../ext/yahttp/Makefile.am pdns/ext/yahttp
+
+mkdir -p pdns/ext/json11
 ln -sf ../../../../ext/json11/json11.{hpp,cpp} pdns/ext/json11
+
+mkdir -p pdns/ext/incbin
 ln -sf ../../../../ext/incbin/incbin.h pdns/ext/incbin
+
+pandoc -s -t man ../../docs/manpages/dnsdist.1.md > dnsdist.1
+
+mkdir -p pdns/ext/yahttp/yahttp
+ln -sf ../../../../ext/yahttp/Makefile.am pdns/ext/yahttp
 cd pdns/ext/yahttp/
 ln -sf ../../../../ext/yahttp/{LICENSE,README.md} .
 cd yahttp
 ln -sf ../../../../../ext/yahttp/yahttp/{Makefile.am,*.cpp,*.hpp,*.h} .
 cd -
 
-