From 57e58c3aa7a2477ce7fa56bfea9d927b4eb43ccd Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 26 Jan 1998 03:09:57 +0000
Subject: Import cvs-1.9.23 as at 19980123.  There are a number of really nice
 things fixed in here, including the '-ko' vs. -A problem with remote cvs
 which caused all files with -ko to be resent each time (which is damn painful
 over a modem, I can tell you).  It also found a heap of stray empty
 directories that should have been pruned with the -P flag to cvs update but
 were not for some reason.

It also has the fully integrated rcs and diff, so no more fork/exec
overheads for rcs,ci,patch,diff,etc.  This means that it parses the control
data in the rcs files only once rather than twice or more.

If the 'cvs diff' vs. Index thing is going to be fixed for future patch
compatability, this is the place to do it.
---
 contrib/cvs/Makefile.in | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'contrib/cvs/Makefile.in')

diff --git a/contrib/cvs/Makefile.in b/contrib/cvs/Makefile.in
index 491097e4279f..ff75cfba5b46 100644
--- a/contrib/cvs/Makefile.in
+++ b/contrib/cvs/Makefile.in
@@ -89,12 +89,12 @@ DISTFILES = \
 	ChangeLog NEWS ChangeLog.zoo \
 	configure configure.in stamp-h.in config.h.in Makefile.in acconfig.h \
 	cvs-format.el mkinstalldirs install-sh \
-	cvsnt.mak \
+	cvsnt.mak cvsnt.dsp \
 	.cvsignore cvs.spec
 
 ### Subdirectories to run make in for the primary targets.
 # Unix source subdirs, where we'll want to run lint and etags:
-USOURCE_SUBDIRS = lib zlib src
+USOURCE_SUBDIRS = lib zlib diff src
 # All other subdirs:
 SUBDIRS = ${USOURCE_SUBDIRS} man doc contrib tools \
 	windows-NT os2 emx macintosh vms
@@ -188,18 +188,21 @@ saber:
 check:
 	cd lib ; $(MAKE) $(FLAGS_TO_PASS)
 	cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
+	cd diff ; $(MAKE) $(FLAGS_TO_PASS)
 	cd src ; $(MAKE) $(FLAGS_TO_PASS) check
 
 .PHONY: remotecheck
 remotecheck:
 	cd lib ; $(MAKE) $(FLAGS_TO_PASS)
 	cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
+	cd diff ; $(MAKE) $(FLAGS_TO_PASS)
 	cd src ; $(MAKE) $(FLAGS_TO_PASS) remotecheck
 
 .PHONY: installcheck
 installcheck:
 	cd lib ; $(MAKE) $(FLAGS_TO_PASS)
 	cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
+	cd diff ; $(MAKE) $(FLAGS_TO_PASS)
 	cd src ; $(MAKE) $(FLAGS_TO_PASS) installcheck
 
 .PHONY: lint
@@ -239,7 +242,7 @@ spec:
 	echo > .fname cvs-`cat .version`
 	rm -f `cat .fname`.spec
 	sed < $(top_srcdir)/cvs.spec \
-	    -e 's/@VERSION@/'`cat .version`'/' \
+	    -e 's/@VERSION@/'`cat .version`'/g' \
 	    > `cat .fname`.spec
 
 
-- 
cgit v1.2.3