===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.422
retrieving revision 1.425
diff -u -p -r1.422 -r1.425
--- mandoc/Makefile	2014/07/10 00:31:10	1.422
+++ mandoc/Makefile	2014/08/04 23:44:29	1.425
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.422 2014/07/10 00:31:10 schwarze Exp $
+# $Id: Makefile,v 1.425 2014/08/04 23:44:29 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
@@ -84,7 +87,6 @@ TESTSRCS	 = test-fgetln.c \
 		   test-reallocarray.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
-		   test-strnlen.c \
 		   test-strptime.c
 
 SRCS		 = LICENSE \
@@ -108,7 +110,6 @@ SRCS		 = LICENSE \
 		   compat_strcasestr.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
-		   compat_strnlen.c \
 		   compat_strsep.c \
 		   config.h.post \
 		   config.h.pre \
@@ -237,7 +238,6 @@ COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_strcasestr.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o \
-		   compat_strnlen.o \
 		   compat_strsep.o
 
 # === DEPENDENCY HANDLING ==============================================
@@ -250,6 +250,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
@@ -372,9 +373,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