--- src/imapd/Makefile.orig	Wed Nov  3 23:50:56 1999
+++ src/imapd/Makefile	Fri Jul  7 00:31:53 2000
@@ -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
@@ -54,21 +54,16 @@
 # Get local definitions from c-client directory
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+#CCLIENTLIB = $C/c-client.a
 CC = `cat $C/CCTYPE`
-CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
+CFLAGS = `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
 	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+LDFLAGS = $(EXTRALDFLAGS) `cat $C/LDFLAGS`
 
 all:	imapd
 
-imapd: $(CCLIENTLIB) imapd.o
+imapd: imapd.o
 	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
-
-imapd.o: $C/mail.h $C/misc.h $C/osdep.h
-
-$(CCLIENTLIB):
-	cd $C;make
 
 clean:
 	rm -f *.o imapd || true