courier-imap/courier-imap-4.0.6.diff

--- bdbobj/Makefile.in
+++ bdbobj/Makefile.in
@@ -225,7 +225,6 @@
 @FOUND_DB_TRUE@testbdb_SOURCES = $(TESTBDBSOURCES)
 @FOUND_DB_TRUE@testbdb_DEPENDENCIES = libbdbobj.la
 @FOUND_DB_TRUE@testbdb_LDADD = libbdbobj.la
-@FOUND_DB_TRUE@testbdb_LDFLAGS = -static
 @FOUND_DB_FALSE@noinst_SCRIPTS = notfound
 EXTRA_DIST = $(LIBDBOBJSOURCES) $(TESTBDBSOURCES) testsuite testsuite.txt
 all: config.h
--- gdbmobj/Makefile.in
+++ gdbmobj/Makefile.in
@@ -226,7 +226,6 @@
 @FOUND_GDBM_TRUE@testgdbm_SOURCES = $(TESTGDBMSOURCES)
 @FOUND_GDBM_TRUE@testgdbm_DEPENDENCIES = libgdbmobj.la
 @FOUND_GDBM_TRUE@testgdbm_LDADD = libgdbmobj.la
-@FOUND_GDBM_TRUE@testgdbm_LDFLAGS = -static
 @FOUND_GDBM_FALSE@noinst_SCRIPTS = notfound
 EXTRA_DIST = $(LIBGDBMSOURCES) $(TESTGDBMSOURCES) testsuite testsuite.txt
 all: config.h
--- imap/imapd-ssl.dist.in
+++ imap/imapd-ssl.dist.in
@@ -102,7 +102,7 @@
 ##NAME: COURIERTLS:0
 #
 
-COURIERTLS=@bindir@/couriertls
+COURIERTLS=@sbindir@/couriertls
 
 ##NAME: TLS_PROTOCOL:0
 # 
--- imap/imapd.8.in
+++ imap/imapd.8.in
@@ -17,9 +17,9 @@
 imapd - Courier-IMAP server
 .SH "SYNOPSIS"
 .HP 25
-\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/bin/imapd} {\./Maildir}
+\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/sbin/imapd} {\./Maildir}
 .HP 19
-\fB@prefix@/bin/imapd\fR {\./Maildir}
+\fB@prefix@/sbin/imapd\fR {\./Maildir}
 .SH "DESCRIPTION"
 .PP
 
--- imap/pop3d-ssl.dist.in
+++ imap/pop3d-ssl.dist.in
@@ -87,7 +87,7 @@
 # at your own risk.  Only the basic SSL/TLS functionality is known to be
 # working. Keep this in mind as you play with the following variables.
 
-COURIERTLS=@bindir@/couriertls
+COURIERTLS=@sbindir@/couriertls
 
 ##NAME: TLS_PROTOCOL:0
 #