Remove the html theme from the tarball

This lead only to license issues with Debian. Right now, the only way to
build the HTML documentation is from the git checkout. Which is ok.

diff --git a/configure.ac b/configure.ac
index 379ec7c40bf46c7df559ebcadaa710f2f6e89bc5..903c37df53f189096fdc3d88f732f2566d7038c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -113,8 +113,7 @@ PDNS_ENABLE_REPRODUCIBLE
 PDNS_WITH_SQLITE3
 
 PDNS_CHECK_PANDOC
-PDNS_CHECK_MKDOCS
-PDNS_CHECK_LINKCHECKER
+PDNS_FROM_GIT
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS_ONCE([strcasestr localtime_r recvmmsg])

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2946e583512aef6d9a44cbf0e6f2eea816a78c93..eeeac6984c16ada52995ed38b0952c45fb515502 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -44,12 +44,14 @@ if HAVE_MANPAGES
 dist_man_MANS = $(MANPAGES_TARGET_AUTH) $(MANPAGES_TARGET_TOOLS)
 endif
 
-EXTRA_DIST = manpages \
-       markdown
+EXTRA_DIST = manpages markdown/*.md markdown/appendix markdown/authoritative markdown/common markdown/httpapi markdown/recursor markdown/security markdown/tools
+
 
 .PHONY: html all-manpages
+
 html: html/index.html
 
+if FROM_GIT
 html/index.html: process-md.sh mkdocs.yml markdown/** markdown/*/** manpages/*
        mkdir -p doc-build
        rsync -a --delete markdown/. doc-build/.
@@ -61,6 +63,18 @@ html/index.html: process-md.sh mkdocs.yml markdown/** markdown/*/** manpages/*
 html.tar.bz2: html
        tar cjf html.tar.bz2 html/
 
+check-links: html
+       ./checklinks.sh
+
+publish: html html.tar.bz2
+       rsync -crv --no-p --chmod=g=rwX --exclude '*~' ./html/ web1.powerdns.com:/srv/www/doc.powerdns.com/md
+       rsync -crv --no-p --chmod=g=rwX --exclude '*~' ./html.tar.bz2 web1.powerdns.com:/srv/www/doc.powerdns.com/html.tar.bz2
+else
+html/index.html:
+       @echo "Building the documentation HTML is only"
+       @echo "supported from a git checkout"
+endif
+
 all-manpages: $(MANPAGES_TARGET_ALL)
 
 if HAVE_PANDOC
@@ -72,14 +86,5 @@ $(MANPAGES_TARGET_ALL):
        exit 1
 endif
 
-if HAVE_LINKCHECKER
-check-links: html
-       ./checklinks.sh
-endif
-
 clean:
        rm -rf html html.tar.bz2 *.8 *.1
-
-publish: html html.tar.bz2
-       rsync -crv --no-p --chmod=g=rwX --exclude '*~' ./html/ web1.powerdns.com:/srv/www/doc.powerdns.com/md
-       rsync -crv --no-p --chmod=g=rwX --exclude '*~' ./html.tar.bz2 web1.powerdns.com:/srv/www/doc.powerdns.com/html.tar.bz2

diff --git a/m4/pdns_check_linkchecker.m4 b/m4/pdns_check_linkchecker.m4
deleted file mode 100644 (file)
index 38d70c8..0000000
--- a/m4/pdns_check_linkchecker.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_DEFUN([PDNS_CHECK_LINKCHECKER], [
-  AC_CHECK_PROG([LINKCHECKER], [linkchecker], [linkchecker], [no])
-
-  AS_IF([test "x$LINKCHECKER" = "xno"], [
-      AC_MSG_WARN([linkchecker is missing, unable to verify links in the documentation.])
-    ])
-  AM_CONDITIONAL([HAVE_LINKCHECKER], [test "x$LINKCHECKER" != "xno"])
-])
-

diff --git a/m4/pdns_check_mkdocs.m4 b/m4/pdns_check_mkdocs.m4
deleted file mode 100644 (file)
index f53aed8..0000000
--- a/m4/pdns_check_mkdocs.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_DEFUN([PDNS_CHECK_MKDOCS], [
-  AC_CHECK_PROG([MKDOCS], [mkdocs], [yes], [no])
-
-  AS_IF([test "x$MKDOCS" = "xno"], [
-    AS_IF([test ! -d "$scrdir/docs/html" ],
-      [AC_MSG_WARN([mkdocs is missing, unable to build documentation.])]
-    )
-  ])
-])

diff --git a/m4/pdns_from_git.m4 b/m4/pdns_from_git.m4
new file mode 100644 (file)
index 0000000..18966a5
--- /dev/null
+++ b/m4/pdns_from_git.m4
@@ -0,0 +1,3 @@
+AC_DEFUN([PDNS_FROM_GIT], [
+  AM_CONDITIONAL([FROM_GIT], [test -d "$srcdir/.git"])
+])