1 diff -ur cvs-1.11.1/Makefile.am cvs-1.11.1.zlib/Makefile.am
2 --- cvs-1.11.1/Makefile.am Wed Jan 3 16:50:41 2001
3 +++ cvs-1.11.1.zlib/Makefile.am Wed May 30 21:46:41 2001
5 ## Subdirectories to run make in for the primary targets.
6 # Unix source subdirs, where we'll want to run lint and etags:
7 # This is a legacy variable from b4 Automake
8 -USOURCE_SUBDIRS = lib zlib diff src
9 +USOURCE_SUBDIRS = lib diff src
11 SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
12 windows-NT os2 emx vms
13 --- cvs-1.11.2/configure.in.orig Thu Apr 18 17:31:39 2002
14 +++ cvs-1.11.2/configure.in Sat Apr 20 00:05:04 2002
19 +AC_CHECK_LIB(z, zlibVersion)
21 dnl The auth server needs to be able to check passwords against passwd
22 dnl file entries, so we only #define AUTH_SERVER_SUPPORT if we can
23 dnl find the crypt function.
28 - windows-NT/SCC/Makefile \
30 + windows-NT/SCC/Makefile],
34 --- cvs-1.11.2/src/Makefile.am.orig Mon Aug 20 19:52:53 2001
35 +++ cvs-1.11.2/src/Makefile.am Sat Apr 20 00:06:59 2002
37 # try and remove naming ocnflicts and fix Automake to allow particular includes
38 # to be attached only to particular object files. Short term fix is either or.
39 ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
40 -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
41 +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
54 # wish this could be distclean-hdr-local but it's not part of automake