===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.390
retrieving revision 1.394
diff -u -p -r1.390 -r1.394
--- mandoc/Makefile	2011/12/13 11:26:12	1.390
+++ mandoc/Makefile	2012/03/23 05:05:41	1.394
@@ -107,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 \
@@ -337,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
@@ -453,12 +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-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 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)
@@ -468,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)
@@ -482,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