===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.341
retrieving revision 1.436
diff -u -p -r1.341 -r1.436
--- mandoc/Makefile	2011/05/19 15:48:58	1.341
+++ mandoc/Makefile	2014/08/10 23:54:41	1.436
@@ -1,100 +1,182 @@
-.PHONY: 	 clean install installwww
-.SUFFIXES:	 .sgml .html .md5 .h .h.html
-.SUFFIXES:	 .1       .3       .7
-.SUFFIXES:	 .1.txt   .3.txt   .7.txt
-.SUFFIXES:	 .1.pdf   .3.pdf   .7.pdf
-.SUFFIXES:	 .1.ps    .3.ps    .7.ps
-.SUFFIXES:	 .1.html  .3.html  .7.html 
-.SUFFIXES:	 .1.xhtml .3.xhtml .7.xhtml 
+# $Id: Makefile,v 1.436 2014/08/10 23:54:41 schwarze Exp $
+#
+# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+VERSION		 = 1.13.1
+
+# === 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.
-# CFLAGS	+= -DOSNAME="\"OpenBSD 4.5\""
+#
+# CFLAGS	+= -DOSNAME="\"OpenBSD 5.5\""
 
-VERSION		 = 1.11.2
-VDATE		 = 12 May 2011
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # 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.
-CFLAGS		+= -g -DUSE_WCHAR -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
-CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+#
+CFLAGS	 	+= -DUSE_WCHAR
+
+CFLAGS		+= -g -W -Wall -Wstrict-prototypes
+CFLAGS     	+= -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 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)
 
-all: mandoc
+# --- user settings related to database support ------------------------
 
-SRCS		 = Makefile \
+# Building apropos(1) and makewhatis(8) requires both SQLite3 and fts(3).
+# To avoid those dependencies, comment the following line.
+# Be careful: the fts(3) implementation in glibc is broken on 32bit
+# machines, see: https://sourceware.org/bugzilla/show_bug.cgi?id=15838
+#
+BUILD_TARGETS	+= db-build
+
+# The remaining settings in this section
+# are only relevant if db-build is enabled.
+# Otherwise, they have no effect either way.
+
+# If your system has manpath(1), uncomment this.  This is most any
+# system that's not OpenBSD or NetBSD.  If uncommented, apropos(1)
+# and makewhatis(8) will use manpath(1) to get the MANPATH variable.
+#
+#CFLAGS		+= -DUSE_MANPATH
+
+# On some systems, SQLite3 may be installed below /usr/local.
+# In that case, uncomment the following two lines.
+#
+#CFLAGS		+= -I/usr/local/include
+#DBLIB		+= -L/usr/local/lib
+
+# OpenBSD has the ohash functions in libutil.
+# Comment the following line if your system doesn't.
+#
+DBLIB		+= -lutil
+
+SBINDIR		 = $(PREFIX)/sbin
+
+# --- user settings related to man.cgi ---------------------------------
+
+# To build man.cgi, copy cgi.h.example to cgi.h, edit it,
+# and enable the following line.
+# Obviously, this requires that db-build is enabled, too.
+#
+#BUILD_TARGETS	+= cgi-build
+
+# The remaining settings in this section
+# are only relevant if cgi-build is enabled.
+# Otherwise, they have no effect either way.
+
+# If your system does not support static binaries, comment this,
+# for example on Mac OS X.
+#
+STATIC		 = -static
+
+# Linux requires -pthread for statical linking.
+#
+#STATIC		+= -pthread
+
+WWWPREFIX	 = /var/www
+HTDOCDIR	 = $(WWWPREFIX)/htdocs
+CGIBINDIR	 = $(WWWPREFIX)/cgi-bin
+
+# === END OF USER SETTINGS =============================================
+
+INSTALL_TARGETS	 = $(BUILD_TARGETS:-build=-install)
+
+BASEBIN		 = mandoc preconv demandoc
+DBBIN		 = apropos makewhatis
+CGIBIN		 = man.cgi
+
+DBLIB		+= -lsqlite3
+
+TESTSRCS	 = test-fgetln.c \
+		   test-getsubopt.c \
+		   test-mmap.c \
+		   test-ohash.c \
+		   test-reallocarray.c \
+		   test-sqlite3_errstr.c \
+		   test-strcasestr.c \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   test-strptime.c \
+		   test-strsep.c
+
+SRCS		 = apropos.c \
 		   arch.c \
-		   arch.in \
 		   att.c \
-		   att.in \
+		   cgi.c \
 		   chars.c \
-		   chars.in \
-		   compat.c \
-		   config.h.post \
-		   config.h.pre \
-		   eqn.7 \
+		   compat_fgetln.c \
+		   compat_getsubopt.c \
+		   compat_ohash.c \
+		   compat_reallocarray.c \
+		   compat_sqlite3_errstr.c \
+		   compat_strcasestr.c \
+		   compat_strlcat.c \
+		   compat_strlcpy.c \
+		   compat_strsep.c \
+		   demandoc.c \
 		   eqn.c \
-		   example.style.css \
-		   external.png \
+		   eqn_html.c \
+		   eqn_term.c \
 		   html.c \
-		   html.h \
-		   index.css \
-		   index.sgml \
 		   lib.c \
-		   lib.in \
-		   libman.h \
-		   libmandoc.h \
-		   libmdoc.h \
-		   libroff.h \
 		   main.c \
-		   main.h \
-		   man.h \
-		   man.7 \
 		   man.c \
 		   man_hash.c \
 		   man_html.c \
 		   man_macro.c \
 		   man_term.c \
 		   man_validate.c \
-		   mandoc.1 \
-		   mandoc.3 \
 		   mandoc.c \
-		   mandoc.h \
-		   makewhatis.1 \
-		   makewhatis.c \
-		   mandoc_char.7 \
-		   mdoc.h \
-		   mdoc.7 \
+		   mandoc_aux.c \
+		   mandocdb.c \
+		   manpage.c \
+		   manpath.c \
+		   mansearch.c \
+		   mansearch_const.c \
 		   mdoc.c \
 		   mdoc_argv.c \
 		   mdoc_hash.c \
 		   mdoc_html.c \
 		   mdoc_macro.c \
+		   mdoc_man.c \
 		   mdoc_term.c \
 		   mdoc_validate.c \
 		   msec.c \
-		   msec.in \
 		   out.c \
-		   out.h \
+		   preconv.c \
 		   read.c \
-		   roff.7 \
 		   roff.c \
 		   st.c \
-		   st.in \
-		   style.css \
-		   tbl.7 \
 		   tbl.c \
 		   tbl_data.c \
 		   tbl_html.c \
@@ -102,23 +184,75 @@ SRCS		 = Makefile \
 		   tbl_opts.c \
 		   tbl_term.c \
 		   term.c \
-		   term.h \
 		   term_ascii.c \
 		   term_ps.c \
-		   test-strlcat.c \
-		   test-strlcpy.c \
 		   tree.c \
 		   vol.c \
-		   vol.in
+		   $(TESTSRCS)
 
+DISTFILES	 = INSTALL \
+		   LICENSE \
+		   Makefile \
+		   Makefile.depend \
+		   NEWS \
+		   TODO \
+		   apropos.1 \
+		   arch.in \
+		   att.in \
+		   cgi.h.example \
+		   chars.in \
+		   compat_ohash.h \
+		   config.h.post \
+		   config.h.pre \
+		   configure \
+		   demandoc.1 \
+		   eqn.7 \
+		   example.style.css \
+		   gmdiff \
+		   html.h \
+		   lib.in \
+		   libman.h \
+		   libmandoc.h \
+		   libmdoc.h \
+		   libroff.h \
+		   main.h \
+		   makewhatis.8 \
+		   man-cgi.css \
+		   man.7 \
+		   man.cgi.8 \
+		   man.h \
+		   mandoc.1 \
+		   mandoc.3 \
+		   mandoc.db.5 \
+		   mandoc.h \
+		   mandoc_aux.h \
+		   mandoc_char.7 \
+		   mandoc_escape.3 \
+		   mandoc_html.3 \
+		   mandoc_malloc.3 \
+		   manpath.h \
+		   mansearch.3 \
+		   mansearch.h \
+		   mchars_alloc.3 \
+		   mdoc.7 \
+		   mdoc.h \
+		   msec.in \
+		   out.h \
+		   preconv.1 \
+		   predefs.in \
+		   roff.7 \
+		   st.in \
+		   style.css \
+		   tbl.3 \
+		   tbl.7 \
+		   term.h \
+		   vol.in \
+		   $(SRCS)
+
 LIBMAN_OBJS	 = man.o \
 		   man_hash.o \
 		   man_macro.o \
 		   man_validate.o
-LIBMAN_LNS	 = man.ln \
-		   man_hash.ln \
-		   man_macro.ln \
-		   man_validate.ln
 
 LIBMDOC_OBJS	 = arch.o \
 		   att.o \
@@ -128,20 +262,8 @@ LIBMDOC_OBJS	 = arch.o \
 		   mdoc_hash.o \
 		   mdoc_macro.o \
 		   mdoc_validate.o \
-		   msec.o \
 		   st.o \
 		   vol.o
-LIBMDOC_LNS	 = arch.ln \
-		   att.ln \
-		   lib.ln \
-		   mdoc.ln \
-		   mdoc_argv.ln \
-		   mdoc_hash.ln \
-		   mdoc_macro.ln \
-		   mdoc_validate.ln \
-		   msec.ln \
-		   st.ln \
-		   vol.ln
 
 LIBROFF_OBJS	 = eqn.o \
 		   roff.o \
@@ -149,154 +271,127 @@ LIBROFF_OBJS	 = eqn.o \
 		   tbl_data.o \
 		   tbl_layout.o \
 		   tbl_opts.o
-LIBROFF_LNS	 = eqn.ln \
-		   roff.ln \
-		   tbl.ln \
-		   tbl_data.ln \
-		   tbl_layout.ln \
-		   tbl_opts.ln
 
 LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 		   $(LIBMDOC_OBJS) \
 		   $(LIBROFF_OBJS) \
 		   chars.o \
 		   mandoc.o \
+		   mandoc_aux.o \
+		   msec.o \
 		   read.o
-LIBMANDOC_LNS	 = $(LIBMAN_LNS) \
-		   $(LIBMDOC_LNS) \
-		   $(LIBROFF_LNS) \
-		   chars.ln \
-		   mandoc.ln \
-		   read.ln
 
-arch.o arch.ln: arch.in
-att.o att.ln: att.in
-chars.o chars.ln: chars.in
-lib.o lib.ln: lib.in
-msec.o msec.ln: msec.in
-st.o st.ln: st.in
-vol.o vol.ln: vol.in
+COMPAT_OBJS	 = compat_fgetln.o \
+		   compat_getsubopt.o \
+		   compat_ohash.o \
+		   compat_reallocarray.o \
+		   compat_sqlite3_errstr.o \
+		   compat_strcasestr.o \
+		   compat_strlcat.o \
+		   compat_strlcpy.o \
+		   compat_strsep.o
 
-$(LIBMAN_OBJS) $(LIBMAN_LNS): libman.h
-$(LIBMDOC_OBJS) $(LIBMDOC_LNS): libmdoc.h
-$(LIBROFF_OBJS) $(LIBROFF_LNS): libroff.h
-$(LIBMANDOC_OBJS) $(LIBMANDOC_LNS): mandoc.h mdoc.h man.h libmandoc.h config.h
-
-MANDOC_HTML_OBJS = html.o \
+MANDOC_HTML_OBJS = eqn_html.o \
+		   html.o \
 		   man_html.o \
 		   mdoc_html.o \
 		   tbl_html.o
-MANDOC_HTML_LNS	 = html.ln \
-		   man_html.ln \
-		   mdoc_html.ln \
-		   tbl_html.ln
 
-MANDOC_TERM_OBJS = man_term.o \
+MANDOC_MAN_OBJS  = mdoc_man.o
+
+MANDOC_TERM_OBJS = eqn_term.o \
+		   man_term.o \
 		   mdoc_term.o \
 		   term.o \
 		   term_ascii.o \
 		   term_ps.o \
 		   tbl_term.o
-MANDOC_TERM_LNS	 = man_term.ln \
-		   mdoc_term.ln \
-		   term.ln \
-		   term_ascii.ln \
-		   term_ps.ln \
-		   tbl_term.ln
 
 MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_MAN_OBJS) \
 		   $(MANDOC_TERM_OBJS) \
 		   main.o \
 		   out.o \
 		   tree.o
-MANDOC_LNS	 = $(MANDOC_HTML_LNS) \
-		   $(MANDOC_TERM_LNS) \
-		   main.ln \
-		   out.ln \
-		   tree.ln
 
-$(MANDOC_HTML_OBJS) $(MANDOC_HTML_LNS): html.h
-$(MANDOC_TERM_OBJS) $(MANDOC_TERM_LNS): term.h
-$(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
+MAKEWHATIS_OBJS	 = mandocdb.o mansearch_const.o manpath.o
 
-compat.o compat.ln: config.h
+PRECONV_OBJS	 = preconv.o
 
-MAKEWHATIS_OBJS	 = makewhatis.o
-MAKEWHATIS_LNS	 = makewhatis.ln
+APROPOS_OBJS	 = apropos.o mansearch.o mansearch_const.o manpath.o
 
-$(MAKEWHATIS_OBJS) $(MAKEWHATIS_LNS): mandoc.h mdoc.h man.h config.h
+CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   cgi.o \
+		   mansearch.o \
+		   mansearch_const.o \
+		   out.o
 
-INDEX_MANS	 = makewhatis.1.html \
-		   makewhatis.1.xhtml \
-		   makewhatis.1.ps \
-		   makewhatis.1.pdf \
-		   makewhatis.1.txt \
+MANPAGE_OBJS	 = manpage.o mansearch.o mansearch_const.o manpath.o
+
+DEMANDOC_OBJS	 = demandoc.o
+
+WWW_MANS	 = apropos.1.html \
+		   demandoc.1.html \
 		   mandoc.1.html \
-		   mandoc.1.xhtml \
-		   mandoc.1.ps \
-		   mandoc.1.pdf \
-		   mandoc.1.txt \
+		   preconv.1.html \
 		   mandoc.3.html \
-		   mandoc.3.xhtml \
-		   mandoc.3.ps \
-		   mandoc.3.pdf \
-		   mandoc.3.txt \
+		   mandoc_escape.3.html \
+		   mandoc_html.3.html \
+		   mandoc_malloc.3.html \
+		   mansearch.3.html \
+		   mchars_alloc.3.html \
+		   tbl.3.html \
+		   mandoc.db.5.html \
 		   eqn.7.html \
-		   eqn.7.xhtml \
-		   eqn.7.ps \
-		   eqn.7.pdf \
-		   eqn.7.txt \
 		   man.7.html \
-		   man.7.xhtml \
-		   man.7.ps \
-		   man.7.pdf \
-		   man.7.txt \
 		   mandoc_char.7.html \
-		   mandoc_char.7.xhtml \
-		   mandoc_char.7.ps \
-		   mandoc_char.7.pdf \
-		   mandoc_char.7.txt \
 		   mdoc.7.html \
-		   mdoc.7.xhtml \
-		   mdoc.7.ps \
-		   mdoc.7.pdf \
-		   mdoc.7.txt \
 		   roff.7.html \
-		   roff.7.xhtml \
-		   roff.7.ps \
-		   roff.7.pdf \
-		   roff.7.txt \
 		   tbl.7.html \
-		   tbl.7.xhtml \
-		   tbl.7.ps \
-		   tbl.7.pdf \
-		   tbl.7.txt
-
-$(INDEX_MANS): mandoc
-
-INDEX_OBJS	 = $(INDEX_MANS) \
+		   makewhatis.8.html \
+		   man.cgi.8.html \
 		   man.h.html \
 		   mandoc.h.html \
-		   mdoc.h.html \
-		   mdocml.tar.gz \
-		   mdocml.md5
+		   mandoc_aux.h.html \
+		   manpath.h.html \
+		   mansearch.h.html \
+		   mdoc.h.html
 
-www: index.html
+WWW_OBJS	 = mdocml.tar.gz \
+		   mdocml.sha256
 
-lint: llib-llibmandoc.ln llib-lmandoc.ln
+# === DEPENDENCY HANDLING ==============================================
 
+all: base-build $(BUILD_TARGETS)
+
+base-build: $(BASEBIN)
+
+db-build: $(DBBIN)
+
+cgi-build: $(CGIBIN)
+
+install: base-install $(INSTALL_TARGETS)
+
+www: $(WWW_OBJS) $(WWW_MANS)
+
+include Makefile.depend
+
+# === TARGETS CONTAINING SHELL COMMANDS ================================
+
 clean:
 	rm -f libmandoc.a $(LIBMANDOC_OBJS)
-	rm -f llib-llibmandoc.ln $(LIBMANDOC_LNS)
+	rm -f apropos $(APROPOS_OBJS)
 	rm -f makewhatis $(MAKEWHATIS_OBJS)
-	rm -f llib-lmakewhatis.ln $(MAKEWHATIS_LNS)
+	rm -f preconv $(PRECONV_OBJS)
+	rm -f man.cgi $(CGI_OBJS)
+	rm -f manpage $(MANPAGE_OBJS)
+	rm -f demandoc $(DEMANDOC_OBJS)
 	rm -f mandoc $(MANDOC_OBJS)
-	rm -f llib-lmandoc.ln $(MANDOC_LNS)
-	rm -f config.h config.log compat.o compat.ln
-	rm -f mdocml.tar.gz
-	rm -f index.html $(INDEX_OBJS)
+	rm -f config.h config.log $(COMPAT_OBJS)
+	rm -f $(WWW_MANS) $(WWW_OBJS)
+	rm -rf *.dSYM
 
-install: all
+base-install: base-build
 	mkdir -p $(DESTDIR)$(BINDIR)
 	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
 	mkdir -p $(DESTDIR)$(LIBDIR)
@@ -304,88 +399,107 @@ install: all
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
-	$(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROGRAM) $(BASEBIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
-	$(INSTALL_LIB) mandoc.h $(DESTDIR)$(INCLUDEDIR)
-	$(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_MAN) mandoc.3 $(DESTDIR)$(MANDIR)/man3
-	$(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \
+		$(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
+		mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(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)
 
-installwww: www
-	mkdir -p $(PREFIX)/snapshots
-	$(INSTALL_DATA) index.html external.png index.css $(PREFIX)
-	$(INSTALL_DATA) $(INDEX_MANS) style.css $(PREFIX)
-	$(INSTALL_DATA) mandoc.h.html man.h.html mdoc.h.html $(PREFIX)
-	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots
-	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots
-	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots/mdocml-$(VERSION).tar.gz
-	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots/mdocml-$(VERSION).md5
+db-install: db-build
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(SBINDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	mkdir -p $(DESTDIR)$(MANDIR)/man3
+	mkdir -p $(DESTDIR)$(MANDIR)/man5
+	mkdir -p $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL_PROGRAM) apropos $(DESTDIR)$(BINDIR)
+	ln -f $(DESTDIR)$(BINDIR)/apropos $(DESTDIR)$(BINDIR)/whatis
+	$(INSTALL_PROGRAM) makewhatis $(DESTDIR)$(SBINDIR)
+	$(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1
+	ln -f $(DESTDIR)$(MANDIR)/man1/apropos.1 \
+		$(DESTDIR)$(MANDIR)/man1/whatis.1
+	$(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
+	$(INSTALL_MAN) makewhatis.8 $(DESTDIR)$(MANDIR)/man8
 
-libmandoc.a: compat.o $(LIBMANDOC_OBJS)
-	$(AR) rs $@ compat.o $(LIBMANDOC_OBJS)
+cgi-install: cgi-build
+	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/
 
-llib-llibmandoc.ln: compat.ln $(LIBMANDOC_LNS)
-	$(LINT) $(LINTFLAGS) -Clibmandoc compat.ln $(LIBMANDOC_LNS)
+www-install: www
+	mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) mdocml.tar.gz \
+		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
+	$(INSTALL_DATA) mdocml.sha256 \
+		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
 
+depend: config.h
+	mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
+	perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
+		s|\\\n||g; s|  +| |g; print;' Makefile.depend > Makefile.tmp
+	mv Makefile.tmp Makefile.depend
+
+libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+
 mandoc: $(MANDOC_OBJS) libmandoc.a
-	$(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-# You'll need -ldb for Linux.
 makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
-	$(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB)
 
-llib-lmandoc.ln: $(MANDOC_LNS)
-	$(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
+preconv: $(PRECONV_OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
-llib-lmakewhatis.ln: $(MAKEWHATIS_LNS)
-	$(LINT) $(LINTFLAGS) -Cmakewhatis $(MAKEWHATIS_LNS)
+manpage: $(MANPAGE_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
 
-mdocml.md5: mdocml.tar.gz
-	md5 mdocml.tar.gz >$@
+apropos: $(APROPOS_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
 
-mdocml.tar.gz: $(SRCS)
+man.cgi: $(CGI_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
+
+demandoc: $(DEMANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
+
+mdocml.sha256: mdocml.tar.gz
+	sha256 mdocml.tar.gz > $@
+
+mdocml.tar.gz: $(DISTFILES)
 	mkdir -p .dist/mdocml-$(VERSION)/
-	$(INSTALL) -m 0444 $(SRCS) .dist/mdocml-$(VERSION)
-	( cd .dist/ && tar zcf ../$@ ./ )
+	$(INSTALL_SOURCE) $(DISTFILES) .dist/mdocml-$(VERSION)
+	chmod 755 .dist/mdocml-$(VERSION)/configure
+	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/
 
-index.html: $(INDEX_OBJS)
-
-config.h: config.h.pre config.h.post
+config.h: configure config.h.pre config.h.post $(TESTSRCS)
 	rm -f config.log
-	( cat config.h.pre; \
-	  echo; \
-	  if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRLCAT'; \
-		rm test-strlcat; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRLCPY'; \
-		rm test-strlcpy; \
-	  fi; \
-	  echo; \
-	  cat config.h.post \
-	) > $@
+	CC="$(CC)" CFLAGS="$(CFLAGS)" DBLIB="$(DBLIB)" \
+		VERSION="$(VERSION)" ./configure
 
+.PHONY: 	 base-install cgi-install db-install install www-install
+.PHONY: 	 clean depend
+.SUFFIXES:	 .1       .3       .5       .7       .8       .h
+.SUFFIXES:	 .1.html  .3.html  .5.html  .7.html  .8.html  .h.html
+
 .h.h.html:
-	highlight -I $< >$@
+	highlight -I $< > $@
 
-.1.1.txt .3.3.txt .7.7.txt:
-	./mandoc -Tascii -Wall,stop $< | col -b >$@
-
-.1.1.html .3.3.html .7.7.html:
-	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
-
-.1.1.ps .3.3.ps .7.7.ps:
-	./mandoc -Tps -Wall,stop $< >$@
-
-.1.1.xhtml .3.3.xhtml .7.7.xhtml:
-	./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@
-
-.1.1.pdf .3.3.pdf .7.7.pdf:
-	./mandoc -Tpdf -Wall,stop $< >$@
-
-.sgml.html:
-	validate --warn $<
-	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@
+.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
+	./mandoc -Thtml -Wall,stop \
+		-Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@