$NetBSD: patch-aa,v 1.9 2012/06/09 11:50:20 adam Exp $

--- Makefile.in.orig	2011-12-03 21:26:32.000000000 +0000
+++ Makefile.in
@@ -295,17 +295,15 @@ EXTRA_DIST = README.html INSTALL.html UP
 	maildroptips.txt COPYING.GPL manpage.css pgpkeys.txt
 
 scriptdir = $(pkgdatadir)/scripts
-DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
-DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
-DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
-MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \
-	maildirmake.html maildropex.html \
-	maildir.html \
+DELIVERQUOTAHTMLSOURCE =
+DELIVERQUOTAHTML =
+DELIVERQUOTAMAN =
+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 \
+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
@@ -1143,12 +1141,8 @@ uninstall-man: uninstall-man1 uninstall-
 #  Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
 
 install-deliverquota:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
-	cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
 
 uninstall-deliverquota:
-	rm -f $(DESTDIR)$(bindir)/deliverquota
 
 install-data-local: install-man install-deliverquota install-maildrop
 
@@ -1176,23 +1170,24 @@ 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
 	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-		$(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
+		$(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog
+		$(LN_S) $(libexecdir)/makedatprog $(DESTDIR)$(bindir)/makedatprog
 	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-		$(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(bindir)/makedat
+		$(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(libexecdir)/makedat
+		$(LN_S) $(libexecdir)/makedat $(DESTDIR)$(bindir)/makedat
 	. maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
 	. maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
 
 uninstall-maildrop:
-	for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \
+	for f in maildrop mailbot reformail lockmail makemime reformime; do \
 		rm -f $(DESTDIR)$(bindir)/$$f ; \
 	done
 	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-		rm -f $(DESTDIR)$(bindir)/makedat ; \
-		rm -f $(DESTDIR)$(bindir)/makedatprog
+		rm -f $(DESTDIR)$(libexecdir)/makedat ; \
+		rm -f $(DESTDIR)$(libexecdir)/makedatprog
 
 all-recursive: all-make-check