From abb6ef754912935a60705b6b1e9687bf79c509b7 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 13 Jan 2016 15:35:36 +0100 Subject: [PATCH] web: Create man page with groff rather than man2html. The man2html project is dead, as is the link on the osl web page. The URL mentioned in the info of the man2html package for Ubuntu-14.04 still works but might not be the most up to date page on the planet any more: http://users.actrix.gen.nz/michael/vhman2html.html In any case, it's a funny read. Needless to say that the link to the sunsite FTP server is also dead. This commit makes osl independent of man2html, simply by running groff -Thtml instead of man2html. This even simplifies the Makefile a bit. The patch also removes the dead link on the osl main page. We don't need a replacement reference to groff because groff should be installed on all systems anyway. --- INSTALL | 1 - Makefile | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 7479010..7d3c78f 100644 --- a/INSTALL +++ b/INSTALL @@ -24,7 +24,6 @@ and are not needed to compile, install or use libosl. In order to make these targets the following additional tools are needed: - http://www.stack.nl/~dimitri/doxygen/ (doxygen) - - http://hydra.nac.uci.edu/indiv/ehood/man2html.html (man2html) - http://www.triptico.com/software/grutatxt.html (grutatxt) - convert (from the http://www.imagemagick.org/script/index.php (ImageMagick) package) diff --git a/Makefile b/Makefile index 7a5846a..e37af6a 100644 --- a/Makefile +++ b/Makefile @@ -199,19 +199,16 @@ www: web/index.html web/osl.png web/doxygen/index.html .PHONY: all shared clean install install-bin install-man install-lib www -web/%.1.html: %.1 - man2html $< > $@ - web/osl.png: web/osl.pdf Makefile convert -scale 200x200 $< $@ -web/index.html: web/oslfsck.1.html web/index.html.in INSTALL README +web/index.html: oslfsck.1 web/index.html.in INSTALL README sed -e '/@README@/,$$d' web/index.html.in > $@ grutatxt -nb < README >> $@ sed -e '1,/@README@/d' -e '/@INSTALL@/,$$d' web/index.html.in >> $@ grutatxt -nb < INSTALL >> $@ sed -e '1,/@INSTALL@/d' -e '/@MAN_PAGE@/,$$d' web/index.html.in >> $@ - sed -e '1,/Return to Main Contents/d' -e '/Index/,$$d' web/oslfsck.1.html >> $@ + groff -m man -Thtml -P -l oslfsck.1 | sed -e '1,/^/d; /^<\/body>/,$$d' >> $@ sed -e '1,/@MAN_PAGE@/d' web/index.html.in >> $@ web/doxygen/index.html: $(wildcard *.c *.h) web/Doxyfile web/header.html \ -- 2.39.2