===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.413
retrieving revision 1.418
diff -u -p -r1.413 -r1.418
--- mandoc/Makefile	2014/03/03 18:53:27	1.413
+++ mandoc/Makefile	2014/04/23 21:06:41	1.418
@@ -1,7 +1,7 @@
 .PHONY: 	 clean install installcgi installwww
 .SUFFIXES:	 .md5 .h .h.html
-.SUFFIXES:	 .1       .3       .7       .8
-.SUFFIXES:	 .1.html  .3.html  .7.html  .8.html
+.SUFFIXES:	 .1       .3       .5       .7       .8
+.SUFFIXES:	 .1.html  .3.html  .5.html  .7.html  .8.html
 
 VERSION		 = 1.13.0
 
@@ -22,7 +22,7 @@ CFLAGS	 	+= -DUSE_WCHAR
 
 # If your system has manpath(1), uncomment this.  This is most any
 # system that's not OpenBSD or NetBSD.  If uncommented, manpage(1) and
-# mandocdb(8) will use manpath(1) to get the MANPATH variable.
+# makewhatis(8) will use manpath(1) to get the MANPATH variable.
 #CFLAGS		+= -DUSE_MANPATH
 
 # If your system does not support static binaries, comment this,
@@ -52,7 +52,7 @@ INSTALL_MAN	 = $(INSTALL_DATA)
 # If you want to build without database support, for example to avoid
 # the dependency on SQLite3, comment the following two lines.
 DBLIB		 = -L/usr/local/lib -lsqlite3
-DBBIN		 = mandocdb manpage apropos
+DBBIN		 = makewhatis manpage apropos
 
 # === END OF USER SETTINGS =============================================
 
@@ -64,12 +64,14 @@ TESTSRCS	 = test-fgetln.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
 		   test-ohash.c \
+		   test-reallocarray.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
 		   test-strnlen.c \
 		   test-strptime.c
 
-SRCS		 = Makefile \
+SRCS		 = LICENSE \
+		   Makefile \
 		   NEWS \
 		   TODO \
 		   apropos.1 \
@@ -85,6 +87,7 @@ SRCS		 = Makefile \
 		   compat_getsubopt.c \
 		   compat_ohash.c \
 		   compat_ohash.h \
+		   compat_reallocarray.c \
 		   compat_strcasestr.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
@@ -111,6 +114,7 @@ SRCS		 = Makefile \
 		   libroff.h \
 		   main.c \
 		   main.h \
+		   makewhatis.8 \
 		   man.7 \
 		   man.c \
 		   man-cgi.css \
@@ -123,13 +127,16 @@ SRCS		 = Makefile \
 		   mandoc.1 \
 		   mandoc.3 \
 		   mandoc.c \
+		   mandoc.db.5 \
 		   mandoc.h \
+		   mandoc_aux.c \
+		   mandoc_aux.h \
 		   mandoc_char.7 \
-		   mandocdb.8 \
 		   mandocdb.c \
 		   manpage.c \
 		   manpath.c \
 		   manpath.h \
+		   mansearch.3 \
 		   mansearch.c \
 		   mansearch.h \
 		   mansearch_const.c \
@@ -201,12 +208,14 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 		   $(LIBROFF_OBJS) \
 		   chars.o \
 		   mandoc.o \
+		   mandoc_aux.o \
 		   msec.o \
 		   read.o
 
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_getsubopt.o \
 		   compat_ohash.o \
+		   compat_reallocarray.o \
 		   compat_strcasestr.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o \
@@ -225,7 +234,7 @@ vol.o: vol.in
 $(LIBMAN_OBJS): libman.h
 $(LIBMDOC_OBJS): libmdoc.h
 $(LIBROFF_OBJS): libroff.h
-$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
+$(LIBMANDOC_OBJS): mandoc.h mandoc_aux.h mdoc.h man.h libmandoc.h config.h
 $(COMPAT_OBJS): config.h compat_ohash.h
 
 MANDOC_HTML_OBJS = eqn_html.o \
@@ -252,10 +261,11 @@ MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   main.o \
 		   out.o \
 		   tree.o
-$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
+$(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h
 
-MANDOCDB_OBJS	 = mandocdb.o mansearch_const.o manpath.o
-$(MANDOCDB_OBJS): mansearch.h mandoc.h mdoc.h man.h config.h manpath.h
+MAKEWHATIS_OBJS	 = mandocdb.o mansearch_const.o manpath.o
+$(MAKEWHATIS_OBJS): mansearch.h mandoc.h mandoc_aux.h \
+		  mdoc.h man.h config.h manpath.h
 
 PRECONV_OBJS	 = preconv.o
 $(PRECONV_OBJS): config.h
@@ -274,16 +284,20 @@ WWW_MANS	 = apropos.1.html \
 		   mandoc.1.html \
 		   preconv.1.html \
 		   mandoc.3.html \
+		   mansearch.3.html \
 		   tbl.3.html \
+		   mandoc.db.5.html \
 		   eqn.7.html \
 		   man.7.html \
 		   mandoc_char.7.html \
 		   mdoc.7.html \
 		   roff.7.html \
 		   tbl.7.html \
-		   mandocdb.8.html \
+		   makewhatis.8.html \
 		   man.h.html \
 		   mandoc.h.html \
+		   manpath.h.html \
+		   mansearch.h.html \
 		   mdoc.h.html
 
 $(WWW_MANS): mandoc
@@ -294,7 +308,7 @@ WWW_OBJS	 = mdocml.tar.gz \
 clean:
 	rm -f libmandoc.a $(LIBMANDOC_OBJS)
 	rm -f apropos $(APROPOS_OBJS)
-	rm -f mandocdb $(MANDOCDB_OBJS)
+	rm -f makewhatis $(MAKEWHATIS_OBJS)
 	rm -f preconv $(PRECONV_OBJS)
 	rm -f manpage $(MANPAGE_OBJS)
 	rm -f demandoc $(DEMANDOC_OBJS)
@@ -310,12 +324,14 @@ install: all
 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
+	mkdir -p $(DESTDIR)$(MANDIR)/man5
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
 	$(INSTALL_PROGRAM) $(ALLBIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
 	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_MAN) mandoc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.3 mansearch.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
 	$(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
 	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
@@ -341,8 +357,8 @@ libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 mandoc: $(MANDOC_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-mandocdb: $(MANDOCDB_OBJS) libmandoc.a
-	$(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
+makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB)
 
 preconv: $(PRECONV_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
@@ -373,5 +389,5 @@ config.h: configure config.h.pre config.h.post $(TESTS
 .h.h.html:
 	highlight -I $< >$@
 
-.1.1.html .3.3.html .7.7.html .8.8.html:
+.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html:
 	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@