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

diff --git a/ChangeLog b/ChangeLog
index 77b9f31bf86c3212b889a4240a24839c6cd8d808..b8abc58417d48e6b4001c6fa5972a80e0e6eec2f 100644 (file)
--- 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 5d1b4c06ad706fd497e772e126c87cf37a9c73d3..26c73e85516f7dbe7c057bfcebe76b47c1ae9452 100644 (file)
--- 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