===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.433
retrieving revision 1.439
diff -u -p -r1.433 -r1.439
--- mandoc/Makefile	2014/08/08 20:34:06	1.433
+++ mandoc/Makefile	2014/08/12 21:35:48	1.439
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.433 2014/08/08 20:34:06 schwarze Exp $
+# $Id: Makefile,v 1.439 2014/08/12 21:35:48 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -30,12 +30,12 @@ VERSION		 = 1.13.1
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
 # UCS-4 value) should you define USE_WCHAR.  If you define it and your
 # system DOESN'T support this, -Tlocale will produce garbage.
-# If you don't define it, -Tlocale is a synonym for -Tacsii.
+# If you don't define it, -Tlocale is a synonym for -Tascii.
 #
 CFLAGS	 	+= -DUSE_WCHAR
 
-CFLAGS		+= -g -DHAVE_CONFIG_H
-CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS		+= -g -W -Wall -Wstrict-prototypes
+CFLAGS     	+= -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 BINDIR		 = $(PREFIX)/bin
 INCLUDEDIR	 = $(PREFIX)/include/mandoc
@@ -52,9 +52,8 @@ 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 SQLite3, comment the following line.
-# However, you won't get apropos(1) and makewhatis(8) in that case.
+# Building apropos(1) and makewhatis(8) requires SQLite3.
+# To avoid that dependency, comment the following line.
 #
 BUILD_TARGETS	+= db-build
 
@@ -116,7 +115,9 @@ CGIBIN		 = man.cgi
 
 DBLIB		+= -lsqlite3
 
-TESTSRCS	 = test-fgetln.c \
+TESTSRCS	 = test-dirent-namlen.c \
+		   test-fgetln.c \
+		   test-fts.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
 		   test-ohash.c \
@@ -134,6 +135,7 @@ SRCS		 = apropos.c \
 		   cgi.c \
 		   chars.c \
 		   compat_fgetln.c \
+		   compat_fts.c \
 		   compat_getsubopt.c \
 		   compat_ohash.c \
 		   compat_reallocarray.c \
@@ -200,6 +202,7 @@ DISTFILES	 = INSTALL \
 		   att.in \
 		   cgi.h.example \
 		   chars.in \
+		   compat_fts.h \
 		   compat_ohash.h \
 		   config.h.post \
 		   config.h.pre \
@@ -281,6 +284,7 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 		   read.o
 
 COMPAT_OBJS	 = compat_fgetln.o \
+		   compat_fts.o \
 		   compat_getsubopt.o \
 		   compat_ohash.o \
 		   compat_reallocarray.o \
@@ -488,7 +492,8 @@ mdocml.tar.gz: $(DISTFILES)
 
 config.h: configure config.h.pre config.h.post $(TESTSRCS)
 	rm -f config.log
-	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
+	CC="$(CC)" CFLAGS="$(CFLAGS)" DBLIB="$(DBLIB)" \
+		VERSION="$(VERSION)" ./configure
 
 .PHONY: 	 base-install cgi-install db-install install www-install
 .PHONY: 	 clean depend