From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Mon, 5 Apr 1999 21:21:40 +0000 (+0000)
Subject: * Makefile.am (CVS): allow command-line overriding of cvs
X-Git-Tag: release-1-3~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9ffd9e0f23a977a8e9c1ada2088a97a70ac12c6;p=thirdparty%2Flibtool.git

* Makefile.am (CVS): allow command-line overriding of cvs
---

diff --git a/ChangeLog b/ChangeLog
index 77b9f31bf..b8abc5841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1999-04-05  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* Makefile.am (CVS): allow command-line overriding of cvs
+
 	* ltconfig.in (exclude_expsyms): Exclude _GLOBAL_OFFSET_TABLE_ by
 	default, as most a.out platforms use it, and end up in trouble if
 	we preload it, so it's safer to rule it out by default, and
diff --git a/Makefile.am b/Makefile.am
index 5d1b4c06a..26c73e855 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,12 +50,13 @@ libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
 # TSDEPS will be defined to TSDEPS_DIST at `make dist' time
 TSDEPS =
 TSDEPS_DIST = ChangeLog libtool.m4
+CVS = cvs # set it to `:' to avoid CVS operations
 
 .PHONY: timestamps update-timestamps
 timestamps distdir: update-timestamps
 update-timestamps:
 	@if (cd $(srcdir) && test -d CVS && \
-	    cvs -n update $(TSDEPS_DIST) | grep '^M'); then \
+	    $(CVS) -n update $(TSDEPS_DIST) | grep '^M'); then \
 		echo "Cannot make dist before commit"; exit 1; else :; fi
 	$(MAKE) TSDEPS="$(TSDEPS_DIST)" $(srcdir)/ltconfig $(srcdir)/ltmain.sh
 
@@ -113,7 +114,8 @@ cvs-dist: distcheck
 	  echo "NEWS not updated; not releasing" 1>&2; \
 	  exit 1;				\
 	fi
-	cd $(srcdir) && cvs -q tag `echo "release-$(VERSION)" | sed 's/\./-/g'`
+	cd $(srcdir) && \
+	 $(CVS) -q tag `echo "release-$(VERSION)" | sed 's/\./-/g'`
 	$(MAKE) dist
 
 cvs-diff:
@@ -122,5 +124,5 @@ cvs-diff:
 	  prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
 	else prevno="$$OLDVERSION"; fi; \
 	prevver=release-`echo $$prevno | sed 's/\./-/g'`; \
-	cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
+	$(CVS) -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
 	    > $(PACKAGE)-$$prevno-$(VERSION).diff