X-Git-Url: http://git.ipfire.org/?p=network.git;a=blobdiff_plain;f=Makefile.am;h=d01e22333f0c851ab5593977a60278102232ce90;hp=ce587b76a776d7a816ab2b9b13cbd4922e91cdfe;hb=8f591cfc10d1876523d608d9643f0a82517c2add;hpb=57496df2abdaa620e8ce68abfa5ad65b211a3484

diff --git a/Makefile.am b/Makefile.am
index ce587b76..d01e2233 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,6 +89,10 @@ INSTALL_EXEC_HOOKS += \
 
 # ------------------------------------------------------------------------------
 
+AM_V_ASCIIDOC   = $(AM_V_ASCIIDOC_$(V))
+AM_V_ASCIIDOC_  = $(AM_V_ASCIIDOC_$(AM_DEFAULT_VERBOSITY))
+AM_V_ASCIIDOC_0 = @echo "  ASCIIDOC" $@;
+
 AM_V_DOWNLOAD   = $(AM_V_DOWNLOAD_$(V))
 AM_V_DOWNLOAD_  = $(AM_V_DOWNLOAD_$(AM_DEFAULT_VERBOSITY))
 AM_V_DOWNLOAD_0 = @echo "  LOAD    " $@;
@@ -449,6 +453,7 @@ INSTALL_DIRS += \
 # ------------------------------------------------------------------------------
 
 MANPAGES = \
+	man/test.8 \
 	man/firewall-settings.8 \
 	man/network.8 \
 	man/network-color.8 \
@@ -472,8 +477,8 @@ MANPAGES = \
 	man/network-zone-pppoe.8 \
 	man/network-zone-wireless.8
 
-MANPAGES_XML  = $(patsubst %.8,%.xml,$(MANPAGES))
-MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML))
+MANPAGES_TXT  = $(patsubst %.8,%.txt,$(MANPAGES))
+MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES))
 
 .PHONY: man
 man: $(MANPAGES) $(MANPAGES_HTML)
@@ -489,7 +494,7 @@ CLEANFILES += \
 	$(MANPAGES_HTML)
 
 EXTRA_DIST += \
-	$(MANPAGES_XML) \
+	$(MANPAGES_TXT) \
 	man/custom-html.xsl
 
 XSLTPROC_FLAGS = \
@@ -507,6 +512,9 @@ XSLTPROC_COMMAND_MAN = \
 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/%.8: man/%.xml
 	$(XSLTPROC_COMMAND_MAN)