$NetBSD: patch-aa,v 1.6 2002/06/16 19:10:26 wiz Exp $

--- Makefile.in.orig	Wed Apr  3 04:49:35 2002
+++ Makefile.in
@@ -34,7 +34,7 @@
 # Pathname of directory to install the man page.
 MANDIR = @mandir@
 # Pathname of directory to install the CGI programs.
-WEBDIR = $(prefix)/www
+WEBDIR = $(prefix)/share/thttpd
 
 # CONFIGURE: The group that the web directory belongs to.  This is so that
 # the makeweb program can be installed set-group-id to that group, and make
@@ -42,7 +42,7 @@
 WEBGROUP =	www
 
 # CONFIGURE: Directory for CGI executables.
-CGIBINDIR =	$(WEBDIR)/cgi-bin
+CGIBINDIR =	$(prefix)/libexec/cgi-bin
 
 # You shouldn't need to edit anything below here.
 
@@ -50,7 +50,7 @@
 CCOPT =		@V_CCOPT@
 DEFS =		@DEFS@
 INCLS =		-I.
-CFLAGS =	$(CCOPT) $(DEFS) $(INCLS)
+CFLAGS +=	$(CCOPT) $(DEFS) $(INCLS)
 LDFLAGS =	@LDFLAGS@
 LIBS =		@LIBS@
 NETLIBS =	@V_NETLIBS@
@@ -109,12 +109,12 @@
 install:	installthis install-man installsubdirs
 
 installthis:
-	-mkdir -p $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR)
+	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
+	$(BSD_INSTALL_PROGRAM) thttpd $(DESTDIR)$(BINDIR)
 
 install-man:
-	-mkdir -p $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8
+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(MANDIR)/man8
+	$(BSD_INSTALL_MAN) thttpd.8 $(DESTDIR)$(MANDIR)/man8
 
 installsubdirs:
 	for i in $(SUBDIRS) ; do ( \