X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=blobdiff_plain;f=Makefile.am;h=287a11176fb0c5a47c37cc7c2c8a0bdb663bb028;hp=d01e22333f0c851ab5593977a60278102232ce90;hb=c601b69e5d8db595fee00241702ee8bd2689c49e;hpb=8f591cfc10d1876523d608d9643f0a82517c2add

diff --git a/Makefile.am b/Makefile.am
index d01e2233..287a1117 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -453,11 +453,9 @@ INSTALL_DIRS += \
 # ------------------------------------------------------------------------------
 
 MANPAGES = \
-	man/test.8 \
 	man/firewall-settings.8 \
 	man/network.8 \
 	man/network-color.8 \
-	man/network-description.8 \
 	man/network-device.8 \
 	man/network-dhcp.8 \
 	man/network-dns-server.8 \
@@ -494,8 +492,7 @@ CLEANFILES += \
 	$(MANPAGES_HTML)
 
 EXTRA_DIST += \
-	$(MANPAGES_TXT) \
-	man/custom-html.xsl
+	$(MANPAGES_TXT)
 
 XSLTPROC_FLAGS = \
 	--nonet \
@@ -509,17 +506,18 @@ XSLTPROC_COMMAND_MAN = \
 	$(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
 		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-XSLTPROC_COMMAND_HTML = \
-	$(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
-
-man/%.xml: man/%.txt
-	$(AM_V_ASCIIDOC)$(ASCIIDOC) -d manpage -b docbook -o $@ $<
+man/%.xml: man/%.txt man/asciidoc.conf
+	$(AM_V_ASCIIDOC)$(ASCIIDOC) \
+		-f man/asciidoc.conf \
+		-d manpage -b docbook -o $@ $<
 
 man/%.8: man/%.xml
 	$(XSLTPROC_COMMAND_MAN)
 
-man/%.html: man/%.xml man/custom-html.xsl
-	$(XSLTPROC_COMMAND_HTML)
+man/%.html: man/%.txt man/asciidoc.conf
+	$(AM_V_ASCIIDOC)$(ASCIIDOC) \
+		-f man/asciidoc.conf \
+		-b html5 -a icons -a theme=flask -o $@ $<
 
 # ------------------------------------------------------------------------------