===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.320
retrieving revision 1.324
diff -u -p -r1.320 -r1.324
--- mandoc/Makefile	2011/03/22 13:15:38	1.320
+++ mandoc/Makefile	2011/03/28 21:49:42	1.324
@@ -17,8 +17,8 @@ CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\
 CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 BINDIR		 = $(PREFIX)/bin
-INCLUDEDIR	 = $(PREFIX)/include
-LIBDIR		 = $(PREFIX)/lib
+INCLUDEDIR	 = $(PREFIX)/include/mandoc
+LIBDIR		 = $(PREFIX)/lib/mandoc
 MANDIR		 = $(PREFIX)/man
 EXAMPLEDIR	 = $(PREFIX)/share/examples/mandoc
 INSTALL		 = install
@@ -57,7 +57,6 @@ SRCS		 = Makefile \
 		   main.h \
 		   man.7 \
 		   man.c \
-		   man_argv.c \
 		   man_hash.c \
 		   man_html.c \
 		   man_macro.c \
@@ -104,7 +103,6 @@ SRCS		 = Makefile \
 		   vol.in
 
 LIBMAN_OBJS	 = man.o \
-		   man_argv.o \
 		   man_hash.o \
 		   man_macro.o \
 		   man_validate.o
@@ -138,10 +136,10 @@ msec.o: msec.in
 st.o: st.in
 vol.o: vol.in
 
-$(LIBMAN_OBJS): libmdoc.h
+$(LIBMAN_OBJS): libman.h
 $(LIBMDOC_OBJS): libmdoc.h
 $(LIBROFF_OBJS): libroff.h
-$(LIBMANDOC_OBJS): mandoc.h libmandoc.h config.h
+$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
 
 MANDOC_HTML_OBJS = html.o \
 		   man_html.o \
@@ -164,7 +162,7 @@ chars.o: chars.in
 
 $(MANDOC_HTML_OBJS): html.h
 $(MANDOC_TERM_OBJS): term.h
-$(MANDOC_OBJS): main.h mandoc.h config.h out.h
+$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
 
 compat.o: config.h
 
@@ -234,7 +232,7 @@ install: all
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
 	$(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
-	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)/
+	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
 	$(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