Do not try to start Bird during boot process

[people/ms/network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d01e22333f0c851ab5593977a60278102232ce90..4c26a9d472612a6d92ebff26a2120fb2dbcb35a5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -453,11 +453,8 @@ 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 \
@@ -477,8 +474,13 @@ MANPAGES = \
        man/network-zone-pppoe.8 \
        man/network-zone-wireless.8
 
+EXTRA_DIST += \
+       man/include-color.txt \
+       man/include-description.txt
+
 MANPAGES_TXT  = $(patsubst %.8,%.txt,$(MANPAGES))
-MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES))
+MANPAGES_HTML = $(patsubst %.txt,%.html,$(MANPAGES_TXT))
+MANPAGES_XML  = $(patsubst %.txt,%.xml,$(MANPAGES_TXT))
 
 .PHONY: man
 man: $(MANPAGES) $(MANPAGES_HTML)
@@ -486,16 +488,14 @@ man: $(MANPAGES) $(MANPAGES_HTML)
 man_MANS = \
        $(MANPAGES)
 
-noinst_DATA += \
-       $(MANPAGES_HTML)
-
 CLEANFILES += \
        $(man_MANS) \
-       $(MANPAGES_HTML)
+       $(MANPAGES_HTML) \
+       $(MANPAGES_XML)
 
 EXTRA_DIST += \
-       $(MANPAGES_TXT) \
-       man/custom-html.xsl
+       man/asciidoc.conf \
+       $(MANPAGES_TXT)
 
 XSLTPROC_FLAGS = \
        --nonet \
@@ -506,20 +506,28 @@ XSLTPROC_FLAGS = \
        --stringparam man.copyright.section.enabled 1
 
 XSLTPROC_COMMAND_MAN = \
-       $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
+       $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
+       $(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)$(MKDIR_P) $(dir $@) && \
+       $(ASCIIDOC) \
+               -f $(abs_srcdir)/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)$(MKDIR_P) $(dir $@) && \
+       $(ASCIIDOC) \
+               -f $(abs_srcdir)/man/asciidoc.conf \
+               -b html5 -a icons -a theme=flask -o $@ $<
+
+.PHONY: upload-man
+upload-man: $(MANPAGES_HTML)
+       rsync -avHz --delete --progress $(MANPAGES_HTML) ms@people.ipfire.org:/pub/man-pages/$(PACKAGE_NAME)/
 
 # ------------------------------------------------------------------------------