--- src/ipopd/Makefile.orig	Wed Oct 25 01:55:07 2000
+++ src/ipopd/Makefile	Mon Oct  1 03:44:26 2001
@@ -19,29 +19,21 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+#CCLIENTLIB = $C/c-client.a
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory
 
-CC = `cat $C/CCTYPE`
-CFLAGS = -I$C `cat $C/CFLAGS`
-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+CFLAGS+=	-DNFSKLUDGE -I$(LOCALBASE)/include/c-client
+LDFLAGS+=	-L$(LOCALBASE)/lib -lc-client4
 
 ipopd: ipop2d ipop3d
 
-ipop2d: $(CCLIENTLIB) ipop2d.o
+ipop2d: ipop2d.o
 	$(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS)
 
-ipop3d: $(CCLIENTLIB) ipop3d.o
+ipop3d: ipop3d.o
 	$(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS)
-
-ipop2d.o: $C/mail.h $C/misc.h $C/osdep.h
-
-ipop3d.o: $C/mail.h $C/misc.h $C/osdep.h
-
-$(CCLIENTLIB):
-	cd $C;make
 
 clean:
 	rm -f *.o ipop2d ipop3d || true