Update build of manpages, contd.

diff --git a/build/Makebottom b/build/Makebottom
index f2cd2c184302ecb822cda26e301ccdb152b82af8..585204dcbaf10fcbc54d48f77ba5112bb528f085 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) $(UCW_MANPAGES)
+docs: runtree $(DOCS) $(DOC_INDICES) $(MANPAGES)
 
 tags:
        etags `find . -name "*.[ch]"`
@@ -210,7 +210,7 @@ $(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
+$(MANPAGES): $(o)/%.1: $(s)/%.txt
        $(M)"MANPAGE $<"
        $(Q)a2x -d manpage -f manpage $<
        $(Q)mv $(patsubst %.txt, %.1, $<) $(dir $@)

diff --git a/ucw/doc/Makefile b/ucw/doc/Makefile
index 19e0cebafa035c888ade02ff6160ae223b0ce1c8..93aa7721ca6edfaeffdd82fde239f03e18f5a0b6 100644 (file)
--- a/ucw/doc/Makefile
+++ b/ucw/doc/Makefile
@@ -6,8 +6,8 @@ UCW_DOCS=basics log fastbuf index config configure install basecode hash docsys
 UCW_INDEX=$(o)/ucw/doc/def_index.html
 UCW_DOCS_HTML=$(addprefix $(o)/ucw/doc/,$(addsuffix .html,$(UCW_DOCS)))
 
-UCW_SRC_MANPAGES=ucw-tableprinter
-UCW_MANPAGES+=$(addprefix  $(o)/ucw/doc/,$(addsuffix .1,$(UCW_SRC_MANPAGES)))
+MANPAGES_SRC=ucw-tableprinter
+MANPAGES+=$(addprefix  $(o)/ucw/doc/,$(addsuffix .1,$(MANPAGES_SRC)))
 
 $(UCW_INDEX): DOC_HEAD=$(s)/ucw/doc/def_index.txt
 $(UCW_INDEX): DOC_LIST=$(patsubst %,$(o)/ucw/doc/%.deflist,$(UCW_DOCS))