$NetBSD: patch-aa,v 1.6 2006/04/28 18:14:06 jlam Exp $

--- Makefile.in.orig	2006-02-19 11:39:50.000000000 -0500
+++ Makefile.in
@@ -243,21 +243,18 @@ EXTRA_DIST = README.html INSTALL.html UP
 	maildroptips.txt automake.fix COPYING.GPL manpage.css pgpkeys.txt
 
 scriptdir = $(pkgdatadir)/scripts
-htmldir = $(pkgdatadir)/html
+htmldir = $(prefix)/share/doc/courier
 DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
-@INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAHTML = 
-@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
-@INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAMAN = 
-@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
-MAILDROPHTML = lockmail.html maildirmake.html maildropex.html \
-	maildir.html \
+DELIVERQUOTAHTML = 
+#DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
+DELIVERQUOTAMAN = 
+#DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
+MAILDROPHTML = lockmail.html maildropex.html \
 	maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
 	makemime.html reformail.html reformime.html
 
-MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
-	maildir.5 \
-	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1 \
-	maildirquota.7 deliverquota.8
+MAILDROPMAN = lockmail.1 maildrop.1 mailbot.1 maildropex.7 \
+	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
 
 EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
 @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3
@@ -1046,15 +1043,15 @@ uninstall-man: uninstall-man1 uninstall-
 #  where deliverquota will be installed.
 #  Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
 
-@INSTALL_DELIVERQUOTA_TRUE@install-deliverquota:
-@INSTALL_DELIVERQUOTA_TRUE@	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@INSTALL_DELIVERQUOTA_TRUE@	$(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
-@INSTALL_DELIVERQUOTA_TRUE@	cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
+#install-deliverquota:
+#	$(mkinstalldirs) $(DESTDIR)$(bindir)
+#	$(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
+#	cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
 
 @INSTALL_DELIVERQUOTA_TRUE@uninstall-deliverquota:
 @INSTALL_DELIVERQUOTA_TRUE@	rm -f $(DESTDIR)$(bindir)/deliverquota
 
-@INSTALL_DELIVERQUOTA_FALSE@install-deliverquota:
+install-deliverquota:
 
 @INSTALL_DELIVERQUOTA_FALSE@uninstall-deliverquota:
 
@@ -1084,7 +1081,6 @@ install-maildrop:
 		$(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
 	done
 	$(INSTALL_PROGRAM) liblock/lockmail $(DESTDIR)$(bindir)/lockmail
-	$(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
 	$(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime
 	$(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime
 	. maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail