===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.421
retrieving revision 1.424
diff -u -p -r1.421 -r1.424
--- mandoc/Makefile	2014/07/09 07:30:47	1.421
+++ mandoc/Makefile	2014/07/13 09:39:32	1.424
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.421 2014/07/09 07:30:47 schwarze Exp $
+# $Id: Makefile,v 1.424 2014/07/13 09:39:32 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -65,8 +65,11 @@ INSTALL_MAN	 = $(INSTALL_DATA)
 # the dependency on SQLite3, comment the following two lines.
 DBLIB		 = -L/usr/local/lib -lsqlite3
 DBBIN		 = makewhatis manpage apropos
-DBBIN		+= man.cgi
 
+# To build man.cgi, copy cgi.h.example to cgi.h, edit it, and
+# either enable the following line or run "make man.cgi" by hand.
+#DBBIN		+= man.cgi
+
 # OpenBSD has the ohash functions in libutil.
 # Comment the following line if your system doesn't.
 DBLIB		+= -lutil
@@ -134,7 +137,7 @@ SRCS		 = LICENSE \
 		   makewhatis.8 \
 		   man.7 \
 		   man.c \
-		   man.cgi.7 \
+		   man.cgi.8 \
 		   man-cgi.css \
 		   man.h \
 		   man_hash.c \
@@ -250,6 +253,7 @@ msec.o: msec.in
 roff.o: predefs.in
 st.o: st.in
 vol.o: vol.in
+cgi.o: cgi.h
 
 $(LIBMAN_OBJS): libman.h
 $(LIBMDOC_OBJS): libmdoc.h
@@ -317,12 +321,12 @@ WWW_MANS	 = apropos.1.html \
 		   mandoc.db.5.html \
 		   eqn.7.html \
 		   man.7.html \
-		   man.cgi.7.html \
 		   mandoc_char.7.html \
 		   mdoc.7.html \
 		   roff.7.html \
 		   tbl.7.html \
 		   makewhatis.8.html \
+		   man.cgi.8.html \
 		   man.h.html \
 		   mandoc.h.html \
 		   mandoc_aux.h.html \
@@ -372,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