Merge branch 'maint'

diff --git a/Documentation/Makefile b/Documentation/Makefile
index aaf95918c3cb0e89b9c608e1df4eb548f38203d7..b6d1d8824f39557495ed479c0823f66f792b51f6 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -32,10 +32,12 @@ man7dir=$(mandir)/man7
 # DESTDIR=
 
 ASCIIDOC=asciidoc
+ASCIIDOC_EXTRA =
 INSTALL?=install
 DOC_REF = origin/man
 
 -include ../config.mak.autogen
+-include ../config.mak
 
 #
 # Please note that there is a minor bug in asciidoc.
@@ -92,7 +94,7 @@ clean:
        rm -f $(cmds_txt)
 
 %.html : %.txt
-       $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $<
+       $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $<
 
 %.1 %.7 : %.xml
        xmlto -m callouts.xsl man $<