https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=d396a37c840dbde626bacd485f07731f35c3f2e3
commit d396a37c840dbde626bacd485f07731f35c3f2e3 Author: Jon TURNEY <[email protected]> Date: Fri Jun 12 13:33:13 2015 +0100 winsup/doc: Make and install manpages for utils Use 'xmlto man' to make manpages for utils (docbook2x-man could also be used, but since we already use xmlto...) This will generate multiple .1 files as an output, but we don't know what they will be called, so use a timestamp file for build avoidance when the dependencies haven't changed. 2015-06-12 Jon Turney <[email protected]> * Makefile.in (install-man, utils2man.stamp): Add rules to build and install manpages for utils. Signed-off-by: Jon TURNEY <[email protected]> Diff: --- winsup/doc/ChangeLog | 5 +++++ winsup/doc/Makefile.in | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index 78a30f9..6f1b01a 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,5 +1,10 @@ 2015-06-12 Jon Turney <[email protected]> + * Makefile.in (install-man, utils2man.stamp): Add rules to build + and install manpages for utils. + +2015-06-12 Jon Turney <[email protected]> + * utils.xml : Convert from using a sect2 element to using a refentry element for each utility program. * cygwin.xsl: Customize autotoc to include refentries. diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in index 856554b..14b4588 100644 --- a/winsup/doc/Makefile.in +++ b/winsup/doc/Makefile.in @@ -16,6 +16,8 @@ prefix:=@prefix@ datarootdir:=@datarootdir@ docdir = @docdir@ htmldir = @htmldir@ +mandir = @mandir@ +man1dir = $(mandir)/man1 override INSTALL:=@INSTALL@ override INSTALL_DATA:=@INSTALL_DATA@ @@ -37,7 +39,7 @@ FAQ_SOURCES:= $(wildcard $(srcdir)/faq*.xml) .html.body: $(srcdir)/bodysnatcher.pl $< -.PHONY: all clean install install-all install-pdf install-html +.PHONY: all clean install install-all install-pdf install-html install-man all: Makefile Makefile.dep \ cygwin-ug-net/cygwin-ug-net.html \ @@ -45,7 +47,8 @@ all: Makefile Makefile.dep \ cygwin-api/cygwin-api.html \ faq/faq.body faq/faq.html \ cygwin-ug-net/cygwin-ug-net.pdf \ - cygwin-api/cygwin-api.pdf + cygwin-api/cygwin-api.pdf \ + utils2man.stamp Makefile: $(srcdir)/Makefile.in /bin/sh ./config.status @@ -54,10 +57,11 @@ clean: rm -f Makefile.dep rm -f *.html *.html.gz rm -Rf cygwin-api cygwin-ug cygwin-ug-net faq + rm -f *.1 utils2man.stamp install: install-all -install-all: install-pdf install-html +install-all: install-pdf install-html install-man install-pdf: cygwin-ug-net/cygwin-ug-net.pdf cygwin-api/cygwin-api.pdf @$(MKDIRP) $(DESTDIR)$(docdir) @@ -71,6 +75,10 @@ install-html: cygwin-ug-net/cygwin-ug-net.html cygwin-api/cygwin-api.html $(INSTALL_DATA) cygwin-api/*.html $(DESTDIR)$(htmldir)/cygwin-api $(INSTALL_DATA) cygwin-api/cygwin-api.html $(DESTDIR)$(htmldir)/cygwin-api/index.html +install-man: utils2man.stamp + @$(MKDIRP) $(DESTDIR)$(man1dir) + $(INSTALL_DATA) *.1 $(DESTDIR)$(man1dir) + cygwin-ug-net/cygwin-ug-net-nochunks.html.gz : $(cygwin-ug-net_SOURCES) cygwin.xsl -$(XMLTO) html-nochunks -m $(srcdir)/cygwin.xsl $< -@$(MKDIRP) cygwin-ug-net @@ -84,6 +92,10 @@ cygwin-ug-net/cygwin-ug-net.html : $(cygwin-ug-net_SOURCES) cygwin.xsl cygwin-ug-net/cygwin-ug-net.pdf : $(cygwin-ug-net_SOURCES) fo.xsl -$(XMLTO) pdf -o cygwin-ug-net/ -m $(srcdir)/fo.xsl $< +utils2man.stamp: $(cygwin-ug-net_SOURCES) + $(XMLTO) man $< + @touch $@ + cygwin-api/cygwin-api.html : $(cygwin-api_SOURCES) cygwin.xsl -$(XMLTO) html -o cygwin-api/ -m $(srcdir)/cygwin.xsl $<
