-DOCS+=$(addprefix $(o)/ucw/doc/,$(addsuffix .html,$(UCW_DOCS)))
-DOC_INDECES+=$(UCW_INDEX)
+$(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)
+DOC_INDICES+=$(UCW_INDEX)
+DOC_MODULES+=ucw
+
+ifdef CONFIG_DOC
+INSTALL_TARGETS+=install-libucw-docs install-libucw-man
+endif
+
+.PHONY: install-libucw-docs install-libucw-man
+
+install-libucw-docs: $(UCW_INDEX) $(UCW_DOCS_HTML)
+ install -d -m 755 $(DESTDIR)$(INSTALL_DOC_DIR)/ucw/
+ install -m 644 $^ $(DESTDIR)$(INSTALL_DOC_DIR)/ucw/
+
+install-libucw-man: $(UCW_MANPAGES_NROFF)
+ install -d -m 755 $(DESTDIR)$(INSTALL_MAN_DIR)/man1/
+ install -m 644 $(UCW_MANPAGES_NROFF) $(DESTDIR)$(INSTALL_MAN_DIR)/man1/