--- Makefile.orig	Tue Nov  5 01:19:13 2002
+++ Makefile	Thu Nov 28 00:11:51 2002
@@ -148,7 +148,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
@@ -215,12 +215,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)
@@ -256,13 +256,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
@@ -396,9 +390,6 @@
 	@echo + In order to rectify this problem, you MUST build with:
 	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	@echo
-	@echo Do you want to continue this build anyway?  Type y or n please:
-	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
 
 sslnone:
 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -411,9 +402,6 @@
 	@echo ++ SSLTYPE=nopwd
 	@echo + You must also have OpenSSL or equivalent installed.
 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	@echo
-	@echo Do you want to continue this build anyway?  Type y or n please:
-	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
 
 
 # C compiler types
@@ -434,7 +422,7 @@
 	$(TOOLS)/$@ "$(LN)" src/tmail tmail
 	$(LN) $(TOOLS)/$@ .
 
-build:	OSTYPE rebuild rebuildclean bundled
+build:	bundled
 
 OSTYPE:
 	@echo Building c-client for $(BUILDTYPE)...