X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2FMakebottom;h=bb8c67d0ecb12b244a880e15b33d637afdc15cbe;hb=9adf0cac23ff0639f64a9d510c71e5aab44c27e9;hp=f2cd2c184302ecb822cda26e301ccdb152b82af8;hpb=182529f4473a1d9b0b2815b6729f0f2b82ab287c;p=libucw.git

diff --git a/build/Makebottom b/build/Makebottom
index f2cd2c18..bb8c67d0 100644
--- 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,10 +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 $@)
+$(MANPAGES): $(o)/%: $(s)/%.txt
+	$(M)"DOC-MAN $<"
+	$(Q)a2x -d manpage -f manpage -D $(dir $@) $<
+	$(Q)mkdir -p run/$(DOCDIR)/man/man$(subst .,,$(suffix $@))
+	$(Q)$(call symlink,$@,run/$(DOCDIR)/man/man$(subst .,,$(suffix $@)))
 
 # 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