===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.389
retrieving revision 1.394
diff -u -p -r1.389 -r1.394
--- mandoc/Makefile	2011/12/10 11:00:00	1.389
+++ mandoc/Makefile	2012/03/23 05:05:41	1.394
@@ -29,7 +29,9 @@ CFLAGS	 	+= -DUSE_WCHAR
 # variable.
 #CFLAGS		+= -DUSE_MANPATH
 
-# If your system supports static binaries only, uncomment this.
+# If your system supports static binaries only, uncomment this.  This
+# appears only to be BSD UNIX systems (Mac OS X has no support and Linux
+# requires -pthreads for static libdb).
 STATIC		 = -static
 
 CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
@@ -76,6 +78,7 @@ SRCS		 = Makefile \
 		   cgi.c \
 		   chars.c \
 		   chars.in \
+		   compat_fgetln.c \
 		   compat_getsubopt.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
@@ -104,7 +107,7 @@ SRCS		 = Makefile \
 		   man.7 \
 		   man.c \
 		   man.cgi.7 \
-		   man.cgi.css \
+		   man-cgi.css \
 		   man.h \
 		   man_hash.c \
 		   man_html.c \
@@ -156,6 +159,7 @@ SRCS		 = Makefile \
 		   term.h \
 		   term_ascii.c \
 		   term_ps.c \
+		   test-fgetln.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
 		   test-strlcat.c \
@@ -224,10 +228,12 @@ LIBMANDOC_LNS	 = $(LIBMAN_LNS) \
 		   msec.ln \
 		   read.ln
 
-COMPAT_OBJS	 = compat_getsubopt.o \
+COMPAT_OBJS	 = compat_fgetln.o \
+		   compat_getsubopt.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o
-COMPAT_LNS	 = compat_getsubopt.ln \
+COMPAT_LNS	 = compat_fgetln.ln \
+		   compat_getsubopt.ln \
 		   compat_strlcat.ln \
 		   compat_strlcpy.ln
 
@@ -331,7 +337,7 @@ $(CGI_OBJS) $(CGI_LNS): main.h mdoc.h man.h out.h conf
 CATMAN_OBJS	 = catman.o manpath.o
 CATMAN_LNS 	 = catman.ln manpath.ln
 
-$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h 
+$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h mandocdb.h
 
 DEMANDOC_OBJS	 = demandoc.o
 DEMANDOC_LNS	 = demandoc.ln
@@ -343,6 +349,11 @@ INDEX_MANS	 = apropos.1.html \
 		   apropos.1.ps \
 		   apropos.1.pdf \
 		   apropos.1.txt \
+		   catman.8.html \
+		   catman.8.xhtml \
+		   catman.8.ps \
+		   catman.8.pdf \
+		   catman.8.txt \
 		   demandoc.1.html \
 		   demandoc.1.xhtml \
 		   demandoc.1.ps \
@@ -373,6 +384,11 @@ INDEX_MANS	 = apropos.1.html \
 		   man.7.ps \
 		   man.7.pdf \
 		   man.7.txt \
+		   man.cgi.7.html \
+		   man.cgi.7.xhtml \
+		   man.cgi.7.ps \
+		   man.cgi.7.pdf \
+		   man.cgi.7.txt \
 		   mandoc_char.7.html \
 		   mandoc_char.7.xhtml \
 		   mandoc_char.7.ps \
@@ -437,11 +453,16 @@ clean:
 	rm -f config.h config.log $(COMPAT_OBJS) $(COMPAT_LNS)
 	rm -f mdocml.tar.gz mdocml-win32.zip mdocml-win64.zip mdocml-macosx.zip
 	rm -f index.html $(INDEX_OBJS)
-	rm -rf test-strlcpy.DSYM
-	rm -rf test-strlcat.DSYM 
-	rm -rf test-strptime.DSYM 
-	rm -rf test-mmap.DSYM 
-	rm -rf test-getsubopt.DSYM
+	rm -rf test-fgetln.dSYM
+	rm -rf test-strlcpy.dSYM
+	rm -rf test-strlcat.dSYM 
+	rm -rf test-strptime.dSYM 
+	rm -rf test-mmap.dSYM 
+	rm -rf test-getsubopt.dSYM
+	rm -rf apropos.dSYM
+	rm -rf catman.dSYM
+	rm -rf mandocdb.dSYM
+	rm -rf whatis.dSYM
 
 install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -451,7 +472,6 @@ install: all
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
-	mkdir -p $(DESTDIR)$(MANDIR)/man8
 	$(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
 	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
@@ -465,7 +485,7 @@ installcgi: all
 	mkdir -p $(DESTDIR)$(HTDOCDIR)
 	$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
 	$(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
-	$(INSTALL_DATA) man.cgi.css $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
 
 installwww: www
 	mkdir -p $(PREFIX)/snapshots
@@ -575,6 +595,10 @@ config.h: config.h.pre config.h.post
 	rm -f config.log
 	( cat config.h.pre; \
 	  echo; \
+	  if $(CC) $(CFLAGS) -Werror -o test-fgetln test-fgetln.c >> config.log 2>&1; then \
+		echo '#define HAVE_FGETLN'; \
+		rm test-fgetln; \
+	  fi; \
 	  if $(CC) $(CFLAGS) -Werror -o test-strptime test-strptime.c >> config.log 2>&1; then \
 		echo '#define HAVE_STRPTIME'; \
 		rm test-strptime; \