--- cvs-1.11.2/src/Makefile.in	Fri Apr 27 22:02:25 2001
+++ cvs/src/Makefile.in	Thu Jun 14 09:20:41 2001
@@ -98,7 +98,7 @@
 # some namespace hackery going on that maybe shouldn't be.  Long term fix is to
 # try and remove naming ocnflicts and fix Automake to allow particular includes
 # to be attached only to particular object files.  Short term fix is either or.
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
 
 bin_PROGRAMS = cvs
 bin_SCRIPTS = cvsbug
diff -urN cvs-1.11.2/src/Makefile.in cvs-1.11.2.new/src/Makefile.in
--- cvs-1.11.2/src/Makefile.in	Mon May  6 17:20:40 2002
+++ cvs-1.11.2.new/src/Makefile.in	Mon May  6 17:19:10 2002
@@ -180,7 +180,7 @@
 cvs_LDADD = \
 	../diff/libdiff.a \
 	../lib/libcvs.a \
-	../zlib/libz.a
+	-lz
 
 
 # extra clean targets
@@ -222,7 +222,7 @@
 	update.$(OBJEXT) version.$(OBJEXT) vers_ts.$(OBJEXT) \
 	watch.$(OBJEXT) wrapper.$(OBJEXT) zlib.$(OBJEXT)
 cvs_OBJECTS = $(am_cvs_OBJECTS)
-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
+cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
 cvs_LDFLAGS =
 SCRIPTS = $(bin_SCRIPTS)
 
--- cvs-1.11.2/src/zlib.c	Thu Apr 19 21:34:04 2001
+++ cvs/src/zlib.c	Fri Apr 20 13:01:36 2001
@@ -22,7 +22,7 @@
 
 #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
 
-#include "zlib.h"
+#include <zlib.h>
 
 /* OS/2 doesn't have EIO.  FIXME: this whole notion of turning
    a different error into EIO strikes me as pretty dubious.  */