Update build of manpages

diff --git a/build/Makebottom b/build/Makebottom
index 1e254aea2507f919f6772fae7848f7948b4b3e88..f2cd2c184302ecb822cda26e301ccdb152b82af8 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -18,7 +18,7 @@ programs: $(PROGS)
 datafiles: $(DATAFILES)
 tests: $(TESTS)
 configs: $(addprefix run/$(CONFIG_DIR)/,$(CONFIGS))
-docs: runtree $(DOCS) $(DOC_INDICES) $(MANPAGES)
+docs: runtree $(DOCS) $(DOC_INDICES) $(UCW_MANPAGES)
 
 tags:
        etags `find . -name "*.[ch]"`
@@ -210,6 +210,11 @@ $(o)/%.html: $(o)/%.txt $(BUILDSYS)/asciidoc.conf $(BUILDSYS)/asciidoc-xhtml.con
        $(Q)asciidoc -e -f $(BUILDSYS)/asciidoc.conf -f $(BUILDSYS)/asciidoc-xhtml.conf -f $(HOST_PREFIX)/etc/asciidoc/asciidoc.conf -f $(HOST_PREFIX)/etc/asciidoc/xhtml11.conf $<
        $(Q)$(call symlink,$@,run/$(DOCDIR)/$(DOC_MODULE))
 
+$(o)/%.1: $(s)/%.txt
+       $(M)"MANPAGE $<"
+       $(Q)a2x -d manpage -f manpage $<
+       $(Q)mv $(patsubst %.txt, %.1, $<) $(dir $@)
+
 # In reality, we do not depend on the .txt files, but on the corresponding .deflist's.
 # However, the Makefile language cannot express that doc-extract generates both .txt
 # and .deflist, so we always use the .txt's in dependencies.

diff --git a/ucw/doc/Makefile b/ucw/doc/Makefile
index 952b200d9c566f449b22f7c3a7262eb1cc288925..19e0cebafa035c888ade02ff6160ae223b0ce1c8 100644 (file)
--- a/ucw/doc/Makefile
+++ b/ucw/doc/Makefile
@@ -7,18 +7,13 @@ UCW_INDEX=$(o)/ucw/doc/def_index.html
 UCW_DOCS_HTML=$(addprefix $(o)/ucw/doc/,$(addsuffix .html,$(UCW_DOCS)))
 
 UCW_SRC_MANPAGES=ucw-tableprinter
-MANPAGES+=$(addprefix  $(o)/ucw/doc/,$(addsuffix .1,$(UCW_SRC_MANPAGES)))
-
-$(o)/ucw/doc/ucw-tableprinter.1: ucw/doc/ucw-tableprinter.txt
-       $(M)"MANPAGE $<"
-       $(Q)a2x -d manpage -f manpage $<
-       $(Q)mv ucw/doc/ucw-tableprinter.1 $(o)/ucw/doc/
+UCW_MANPAGES+=$(addprefix  $(o)/ucw/doc/,$(addsuffix .1,$(UCW_SRC_MANPAGES)))
 
 $(UCW_INDEX): DOC_HEAD=$(s)/ucw/doc/def_index.txt
 $(UCW_INDEX): DOC_LIST=$(patsubst %,$(o)/ucw/doc/%.deflist,$(UCW_DOCS))
 $(UCW_INDEX) $(UCW_DOCS_HTML): DOC_MODULE=ucw
 
-DOCS+=$(UCW_DOCS_HTML) $(UCW_MANPAGES)
+DOCS+=$(UCW_DOCS_HTML)
 DOC_INDICES+=$(UCW_INDEX)
 DOC_MODULES+=ucw