$NetBSD: patch-ad,v 1.5 2005/08/11 00:03:51 jlam Exp $

--- sqwebmail/Makefile.in.orig	2005-07-23 10:00:36.000000000 -0400
+++ sqwebmail/Makefile.in
@@ -284,7 +284,7 @@ CLEANFILES = htmllibdir.h ldapsearch web
 
 DISTCLEANFILES = webmail.authpam
 SUBDIRS = images html
-script_SCRIPTS = sendit.sh cleancache.pl ldapsearch webgpg
+script_SCRIPTS = sendit.sh cleancache.pl ldapsearch
 sysconf_DATA = ldapaddressbook.dist sqwebmaild.dist
 DOCS = SECURITY BUGS TODO SECURITY.html BUGS.html TODO.html
 noinst_DATA = $(DOCS) TIMEZONELIST
@@ -979,7 +979,7 @@ install-perms-local: install-perms-cache
 
 htmllibdir.h: config.status
 	echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
-	echo '#define SENDITSH "$(scriptdir)/sendit.sh"' >>htmllibdir.h
+	echo '#define SENDITSH "$(sysconfdir)/sendit.sh"' >>htmllibdir.h
 	echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
 	echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h
 	echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
@@ -987,7 +987,7 @@ htmllibdir.h: config.status
 	echo '#define SOCKDIR "$(localstatedir)"' >>htmllibdir.h
 	echo '#define SHAREDINDEXFILE "$(sysconfdir)/shared/index"' >>htmllibdir.h
 	echo '#define SQWEBPASSWD "$(pkglibexecdir)/sqwebpasswd"' >>htmllibdir.h
-	if test -d $(srcdir)/../courier \
+	if true || test -d $(srcdir)/../courier \
 		; then \
 		echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \
 		; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \
@@ -996,7 +996,7 @@ htmllibdir.h: config.status
 		; echo '#define MAKEMIME "$(pkglibexecdir)/makemime"' >>htmllibdir.h \
 		; fi
 	echo '#define LDAPADDRESSBOOK "$(sysconfdir)/ldapaddressbook"' >>htmllibdir.h
-	echo '#define LDAPSEARCH "$(scriptdir)/ldapsearch"' >>htmllibdir.h
+	echo '#define LDAPSEARCH "$(sysconfdir)/ldapsearch"' >>htmllibdir.h
 	echo '#define AUTHCHARSET "$(sysconfdir)/authcharset"' >>htmllibdir.h
 
 ldapsearch: ../ldapaddressbook/ldapsearch
@@ -1024,9 +1024,6 @@ install-perms-cache:
 	@echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat
 
 cache-reminder:
-	-$(mkinstalldirs) $(DESTDIR)@cachedir@
-	-$(mkinstalldirs) $(DESTDIR)$(piddir)
-	test -w /etc || exit 0; chown @cacheowner@ $(DESTDIR)@cachedir@
 	@rm -f cron.cmd
 	@echo '#! @SHELL@' >cron.cmd
 	@echo 'su -p -c "$(scriptdir)/cleancache.pl" @cacheowner@' >>cron.cmd
