--- Makefile.orig	Sat Dec  8 14:11:42 2001
+++ Makefile	Sat Dec  8 14:13:19 2001
@@ -147,7 +147,7 @@
 # std	system standard (typically passwd file), determined by port
 # two	try alternative (defined by CHECKPWALT), then std
 
-PASSWDTYPE=std
+PASSWDTYPE=pam
 
 
 # SSL type.  Defines whether or not SSL support is on this system
@@ -212,12 +212,12 @@
 #	gradually-increasing intervals, starting at 2800-2900, and becoming
 #	permanent at 48,300.
 
-EXTRACFLAGS=
+EXTRACFLAGS=-I$(PREFIX)/include/c-client
 
 
 # Extra linker flags (additional/alternative libraries, etc.)
 
-EXTRALDFLAGS=
+EXTRALDFLAGS=-L$(PREFIX)/lib -lc-client4
 
 
 # Special make flags (e.g. to override make environment variables)
@@ -253,13 +253,7 @@
 
 # Make the IMAP Toolkit
 
-all:	SPECIALS c-client rebuild bundled
-
-c-client:
-	@echo Not processed yet.  In a first-time build, you must specify
-	@echo the system type so that the sources are properly processed.
-	@false
-
+all:	bundled
 
 SPECIALS:
 	echo $(SPECIALS) > SPECIALS
@@ -374,7 +368,7 @@
 	$(TOOLS)/$@ "$(LN)" src/imapd imapd
 	$(LN) $(TOOLS)/$@ .
 
-build:	OSTYPE rebuild rebuildclean bundled
+build:	bundled
 
 OSTYPE:
 	@echo Building c-client for $(BUILDTYPE)...