From 5bc9f2267ffdd13c5a68d381a53ab048d3ce2fd6 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Fri, 16 Jan 2015 15:23:11 +0100 Subject: [PATCH] Doc: Man pages are now generated as both HTML and NROFF --- debian/rules | 2 +- maint/release | 2 +- ucw/doc/Makefile | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index 29b48b1a..d236a4f8 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,7 @@ install: build $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-dev install-libucw-api $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-utils install-ucw-shell install-ucw-utils ifdef CONFIG_DOC - $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-doc install-libucw-docs install-libucw-config + $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-doc install-libucw-docs install-libucw-man install-libucw-config install -d -m 755 $(CURDIR)/debian/libucw-doc/usr/share/doc/libucw/examples cp -r examples/external $(CURDIR)/debian/libucw-doc/usr/share/doc/libucw/examples/program endif diff --git a/maint/release b/maint/release index 25a54a60..5f34b38d 100755 --- a/maint/release +++ b/maint/release @@ -24,7 +24,7 @@ if ($r->{"do_upload"}) { my $tdir = $r->{"TESTDIR"}; if (defined $tdir) { print "Generating documentation\n"; - `cd $tdir && make install-libucw-docs INSTALL_DOC_DIR=../doc INSTALL_MAN_DIR=../man`; + `cd $tdir && make install-libucw-docs INSTALL_DOC_DIR=../doc`; die if $?; print "Upload of documentation\n"; $r->Confirm; diff --git a/ucw/doc/Makefile b/ucw/doc/Makefile index 6cd6ce49..9c09efe2 100644 --- a/ucw/doc/Makefile +++ b/ucw/doc/Makefile @@ -7,8 +7,10 @@ UCW_INDEX=$(o)/ucw/doc/def_index.html UCW_DOCS_HTML=$(addprefix $(o)/ucw/doc/,$(addsuffix .html,$(UCW_DOCS))) UCW_MANPAGES=ucw-tableprinter.1 +UCW_MANPAGES_HTML=$(patsubst %,$(o)/ucw/doc/%.html,$(UCW_MANPAGES)) UCW_MANPAGES_NROFF=$(addprefix $(o)/ucw/doc/,$(UCW_MANPAGES)) MANPAGES+=$(UCW_MANPAGES_NROFF) +UCW_DOCS_HTML+=$(UCW_MANPAGES_HTML) $(UCW_INDEX): DOC_HEAD=$(s)/ucw/doc/def_index.txt $(UCW_INDEX): DOC_LIST=$(patsubst %,$(o)/ucw/doc/%.deflist,$(UCW_DOCS)) @@ -19,12 +21,15 @@ DOC_INDICES+=$(UCW_INDEX) DOC_MODULES+=ucw ifdef CONFIG_DOC -INSTALL_TARGETS+=install-libucw-docs +INSTALL_TARGETS+=install-libucw-docs install-libucw-man endif -.PHONY: install-libucw-docs -install-libucw-docs: $(UCW_INDEX) $(UCW_DOCS_HTML) $(UCW_MANPAGES_NROFF) +.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/ -- 2.39.2