--- Makefile.in.orig	2015-04-25 13:49:07 UTC
+++ Makefile.in
@@ -395,8 +395,7 @@ sbin_SCRIPTS = sharedindexinstall shared
 CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
 databindir = $(datadir)
 databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
-	makeimapaccess makedat
+binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
 
 sbinPROGRAMS = imaplogin pop3login
 libexecPROGRAMS = makedatprog couriertcpd
@@ -412,7 +411,7 @@ man_MANS = couriertcpd.1 deliverquota.8 
 EXTRA_DIST = README README.cygwin COPYING.GPL NEWS.html $(TEMPLFILES) \
 	pgpkeys.txt sysconftool
 sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
-	imapd.cnf pop3d.cnf quotawarnmsg.example
+	quotawarnmsg.example
 
 libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 HTML2TXT = links -dump -no-numbering -no-references
@@ -793,8 +792,8 @@ install-man1: $(man_MANS)
 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 	while read files; do \
 	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	    echo " %%INSTALL_MAN%% $$files '$(DESTDIR)$(man1dir)'"; \
+	    %%INSTALL_MAN%% $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
 	done; }
 
 uninstall-man1:
@@ -829,15 +828,15 @@ install-man8: $(man_MANS)
 	sed 'N;N;s,\n, ,g' | { \
 	list=; while read file base inst; do \
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
+	    echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	    %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
 	  fi; \
 	done; \
 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 	while read files; do \
 	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
+	    echo " %%INSTALL_MAN%% $$files '$(DESTDIR)$(man8dir)'"; \
+	    %%INSTALL_MAN%% $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
 	done; }
 
 uninstall-man8: