* Makefile.maint (TSDEPS_DIST): Removed. No longer used.

(TSDEPS): libtool.m4 has long since moved to libltdl.
(cvs-dist): Don't put the suffix dot in twice.

diff --git a/ChangeLog b/ChangeLog
index bf0b8aa2fddec1bfffe26705711b609595b1991a..142f14a9903ab3ae8373db5cbb89ebf6c11863a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-06  Gary V. Vaughan  <gary@gnu.org>
+
+       * Makefile.maint (TSDEPS_DIST): Removed.  No longer used.
+       (TSDEPS): libtool.m4 has long since moved to libltdl.
+       (cvs-dist): Don't put the suffix dot in twice.
+
 2008-03-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * tests/convenience.at (Java convenience archives): Skip test if

diff --git a/Makefile.maint b/Makefile.maint
index 544140527a6dc48265cd9ca7649a262b824e86d2..72cac5b77123bced815d6e7243b21079e2f582ee 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -93,16 +93,14 @@ prev-tarball:
        if test -f $$ofile; then :; \
        else echo "Cannot make deltas without $$ofile"; exit 1; fi
 
-# TSDEPS will be defined to TSDEPS_DIST at `make dist' time
-TSDEPS =
-TSDEPS_DIST = ChangeLog m4/libtool.m4
+TSDEPS = ChangeLog libltdl/m4/libtool.m4
 CVS = cvs # set it to `:' to avoid CVS operations
 
 .PHONY: timestamps update-timestamps
 timestamps: update-timestamps
 update-timestamps:
        @if (cd $(srcdir) && test -d CVS && \
-           $(CVS) -n update $(TSDEPS_DIST) | grep '^M'); then \
+           $(CVS) -n update $(TSDEPS) | grep '^M'); then \
                echo "Cannot make cvs-dist before commit"; exit 1; else :; fi
 
 
@@ -173,7 +171,7 @@ cvs-dist: cvs-news timestamps
        cd $(srcdir) \
          && $(CVS) -q tag `echo "release-$(VERSION)" | sed 's/\./-/g'`
 ## Generate signatures and directives for FSF ftp-upload:
-       for suffix in .gz .bz2; do \
+       for suffix in gz bz2; do \
          ofile="$(PACKAGE)-$(VERSION).tar.$$suffix"; \
          $(GPG) --detach-sign $$ofile \
          && echo "directory: libtool" > $$ofile.directive \