===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.395.2.20
retrieving revision 1.395.2.22
diff -u -p -r1.395.2.20 -r1.395.2.22
--- mandoc/Makefile	2014/08/05 00:42:53	1.395.2.20
+++ mandoc/Makefile	2014/08/05 01:46:07	1.395.2.22
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.395.2.20 2014/08/05 00:42:53 schwarze Exp $
+# $Id: Makefile,v 1.395.2.22 2014/08/05 01:46:07 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -19,6 +19,8 @@ VERSION		 = 1.12.4
 
 # === USER SETTINGS ====================================================
 
+# --- user settings relevant for all builds ----------------------------
+
 # Specify this if you want to hard-code the operating system to appear
 # in the lower-left hand corner of -mdoc manuals.
 #
@@ -32,37 +34,43 @@ VERSION		 = 1.12.4
 #
 CFLAGS	 	+= -DUSE_WCHAR
 
-# If your system has manpath(1), uncomment this.  This is most any
-# system that's not OpenBSD or NetBSD.  If uncommented, apropos(1),
-# and mandocdb(8) will popen(3) manpath(1) to get the MANPATH
-# variable.
-#CFLAGS		+= -DUSE_MANPATH
-
 CFLAGS		+= -g -DHAVE_CONFIG_H
 CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
-WWWPREFIX	 = /var/www
-HTDOCDIR	 = $(WWWPREFIX)/htdocs
 BINDIR		 = $(PREFIX)/bin
 INCLUDEDIR	 = $(PREFIX)/include/mandoc
 LIBDIR		 = $(PREFIX)/lib/mandoc
 MANDIR		 = $(PREFIX)/man
 EXAMPLEDIR	 = $(PREFIX)/share/examples/mandoc
+
 INSTALL		 = install
-INSTALL_PROGRAM	 = $(INSTALL) -m 0755
+INSTALL_PROGRAM	 = $(INSTALL) -m 0555
 INSTALL_DATA	 = $(INSTALL) -m 0444
-INSTALL_LIB	 = $(INSTALL) -m 0644
+INSTALL_LIB	 = $(INSTALL) -m 0444
 INSTALL_SOURCE	 = $(INSTALL) -m 0644
 INSTALL_MAN	 = $(INSTALL_DATA)
 
+# --- user settings related to database support ------------------------
+
+# If you want to build without database support, for example to avoid
+# the dependency on Berkeley DB, comment the following line.
+#
+DBBIN		 = apropos mandocdb whatis
+
 # Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and
 # apropos.
-# However, if you don't have -ldb at all (or it's not native), then
-# comment out apropos and mandocdb. 
 #
 #DBLIB		 = -ldb
-DBBIN		 = apropos mandocdb whatis
 
+# If your system has manpath(1), uncomment this.  This is most any
+# system that's not OpenBSD or NetBSD.  If uncommented, apropos(1)
+# and mandocdb(8) will use manpath(1) to get the MANPATH variable.
+#
+#CFLAGS		+= -DUSE_MANPATH
+
+WWWPREFIX	 = /var/www
+HTDOCDIR	 = $(WWWPREFIX)/htdocs
+
 # === END OF USER SETTINGS =============================================
 
 ALLBIN		 = mandoc preconv demandoc $(DBBIN)
@@ -74,9 +82,11 @@ TESTSRCS	 = test-betoh64.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
 		   test-reallocarray.c \
+		   test-strcasestr.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
-		   test-strptime.c
+		   test-strptime.c \
+		   test-strsep.c
 
 SRCS		 = LICENSE \
 		   Makefile \
@@ -135,6 +145,7 @@ SRCS		 = LICENSE \
 		   mandoc_aux.c \
 		   mandoc_aux.h \
 		   mandoc_char.7 \
+		   mandoc_html.3 \
 		   mandocdb.8 \
 		   mandocdb.c \
 		   mandocdb.h \
@@ -284,6 +295,7 @@ WWW_MANS	 = apropos.1.html \
 		   preconv.1.html \
 		   whatis.1.html \
 		   mandoc.3.html \
+		   mandoc_html.3.html \
 		   tbl.3.html \
 		   eqn.7.html \
 		   man.7.html \