summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-07-13 09:39:32 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-07-13 09:39:32 +0000
commitf7cbf679908f58cb3462bdd42e4950810b04b85d (patch)
tree29122978cff78e3be560e4907588e9a94ce2a093
parent2906400105b323eed34fff88bc761602177d6a6d (diff)
downloadmandoc-f7cbf679908f58cb3462bdd42e4950810b04b85d.tar.gz
Install the manuals of the web interface below the same directory
as manpath.conf, such that we do not need to mix our own documentation into the documentation we are serving, which may not even be possible if the latter is updated automatically. Based on an idea by beck@.
-rw-r--r--Makefile4
-rw-r--r--cgi.c8
-rw-r--r--man.cgi.84
3 files changed, 12 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 098671bc..fec3c33f 100644
--- a/Makefile
+++ b/Makefile
@@ -376,9 +376,13 @@ install: all
installcgi: all
mkdir -p $(DESTDIR)$(CGIBINDIR)
mkdir -p $(DESTDIR)$(HTDOCDIR)
+ mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1
+ mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8
$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
$(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
+ $(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
+ $(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
installwww: www
mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
diff --git a/cgi.c b/cgi.c
index 221c186a..3948acb7 100644
--- a/cgi.c
+++ b/cgi.c
@@ -463,10 +463,10 @@ resp_index(const struct req *req)
resp_searchform(req);
printf("<P>\n"
"This web interface is documented in the "
- "<A HREF=\"%s?query=man.cgi&amp;sec=8\">"
- "man.cgi</A> manual, and the "
- "<A HREF=\"%s?query=apropos&amp;sec=1\">"
- "apropos</A> manual explains the query syntax.\n"
+ "<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A> "
+ "manual, and the "
+ "<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A> "
+ "manual explains the query syntax.\n"
"</P>\n",
scriptname, scriptname);
resp_end_html();
diff --git a/man.cgi.8 b/man.cgi.8
index e9f23bce..2abb15f6 100644
--- a/man.cgi.8
+++ b/man.cgi.8
@@ -270,6 +270,10 @@ Default
data directory containing all the manual trees.
Can be overridden by
.Ev MAN_DIR .
+.It Pa /man/mandoc/man1/apropos.1 , /man/mandoc/man8/man.cgi.8
+Manual pages documenting
+.Nm
+itself, linked from the index page.
.It Pa /man/manpath.conf
The list of available manpaths, one per line.
.It Pa /man/OpenBSD-current/man1/mandoc.1