--- src/imapd/Makefile.orig	Sat Nov 21 05:26:03 1998
+++ src/imapd/Makefile	Sat Feb 27 17:19:33 1999
@@ -31,9 +31,9 @@
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
-ALERT=/etc/imapd.alert
+ALERT=$(PREFIX)/etc/imapd.alert
 USERALERT=.imapalert
-ANO=/etc/anonymous.newsgroups
+ANO=$(PREFIX)/etc/anonymous.newsgroups
 SHELL= /bin/sh
 
 #  The "Manage Mail" menu item of Netscape Messager puts up an error message
@@ -56,7 +56,7 @@
 CC = `cat $C/CCTYPE`
 CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
 	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS`
 
 all:	imapd
 
--- src/ipopd/Makefile.orig	Wed Apr 15 01:41:55 1998
+++ src/ipopd/Makefile	Sat Oct 10 21:48:00 1998
@@ -39,7 +39,7 @@
 
 CC = `cat $C/CCTYPE`
 CFLAGS = -I$C `cat $C/CFLAGS`
-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS`
 
 ipopd: ipop2d ipop3d
 
--- src/mtest/Makefile.orig	Wed Apr 15 07:42:04 1998
+++ src/mtest/Makefile	Fri Feb  4 14:37:44 2000
@@ -39,14 +39,16 @@
 
 CC = `cat $C/CCTYPE`
 CFLAGS = -I$C `cat $C/CFLAGS`
-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS`
 
 all:	mtest
 
-mtest: $(CCLIENTLIB) mtest.o
-	$(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
+mtest: $(CCLIENTLIB) mtest.o safegets.o
+	$(CC) $(CFLAGS) -o mtest mtest.o safegets.o $(LDFLAGS)
 
-mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h
+mtest.o:  safegets.h $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h
+
+safegets.o: safegets.h $C/mail.h
 
 $(CCLIENTLIB):
 	cd $C;make