$NetBSD: patch-aa,v 1.11 2005/08/11 00:04:01 jlam Exp $

--- Makefile.in.orig	2005-07-23 09:33:42.000000000 -0400
+++ Makefile.in
@@ -246,10 +246,11 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
 
-sbin_SCRIPTS = sharedindexinstall sharedindexsplit
+sbin_SCRIPTS = 
 CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
 databindir = $(datadir)
-databin_SCRIPTS = mkimapdcert mkpop3dcert
-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
-sbinPROGRAMS = imaplogin pop3login
-libexecPROGRAMS = makedatprog couriertcpd
-man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
+databin_SCRIPTS = mkimapdcert mkpop3dcert \
+	imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
+binPROGRAMS = imapd
+sbinPROGRAMS = couriertcpd
+libexecPROGRAMS = imaplogin courierpop3login courierpop3d
+man_MANS = couriertcpd.1 courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
 
@@ -264,5 +265,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
 sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
-	imapd.cnf pop3d.cnf quotawarnmsg.example
+	imapd.cnf pop3d.cnf
 
-libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
+libexec_SCRIPTS = 
 HTML2TXT = links -dump -no-numbering
@@ -1019,7 +1020,7 @@ sharedindexsplit: maildir/sharedindexspl
 
-pop3login$(EXEEXT): imap/pop3login$(EXEEXT)
-	cp imap/pop3login$(EXEEXT) .
+courierpop3login$(EXEEXT): imap/pop3login$(EXEEXT)
+	cp imap/pop3login$(EXEEXT) ./$@
 
-pop3d$(EXEEXT): imap/pop3d$(EXEEXT)
-	cp imap/pop3d$(EXEEXT) .
+courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT)
+	cp imap/pop3d$(EXEEXT) ./$@
 
@@ -1067,4 +1068,7 @@ maildirkw.1: maildir/maildirkw.1
 
-imapd.8: imap/imapd.8
-	cp imap/imapd.8 .
+courierimapd.8: imap/imapd.8
+	cp imap/imapd.8 ./$@
+
+courierpop3d.8: imap/courierpop3d.8
+	cp imap/courierpop3d.8 .
 
@@ -1097,3 +1101,3 @@ install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)$(sbindir)
-	for f in mkimapdcert mkpop3dcert ; \
+	for f in imapd-ssl imapd mkimapdcert mkpop3dcert pop3d pop3d-ssl ; \
 		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
@@ -1103,17 +1107,4 @@ install-exec-local:
 install-exec-hook:
-	chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
-	mkdir -p $(DESTDIR)$(sysconfdir)/shared
-	chmod 755 $(DESTDIR)$(sysconfdir)/shared
-	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
-	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
 
 install-data-local: install-man
-	test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
-	test -w $(DESTDIR)/etc/pam.d || exit 0 ; \
-	test -f $(DESTDIR)/etc/pam.d/imap || \
-		$(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
-		$(DESTDIR)/etc/pam.d/imap || exit 1 ;\
-	test -f $(DESTDIR)/etc/pam.d/pop3 || \
-		$(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
-		$(DESTDIR)/etc/pam.d/pop3 || exit 1
 	for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done