Use new version of announce-gen.

* Makefile.maint (announcement): Remove use of the
--gnulib-snapshot-time-stamp option.
Use new --gnulib-version option instead.
(gnulib-version): New variable.

diff --git a/ChangeLog b/ChangeLog
index c21ad109d083eb894ba18c68e205539485c7adb3..2551164817b8fcee771f1b50fbd94e9af84598a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-12  Jim Meyering  <meyering@redhat.com>
+
+       Use new version of announce-gen.
+       * Makefile.maint (announcement): Remove use of the
+       --gnulib-snapshot-time-stamp option.
+       Use new --gnulib-version option instead.
+       (gnulib-version): New variable.
+
 2008-01-11  Jim Meyering  <meyering@redhat.com>
 
        * Version 6.9.92.

diff --git a/Makefile.maint b/Makefile.maint
index fe6bee5014b041e06cb8ae42f499020c8aad0756..fa2ceb673bba0ebe58f2090b349d4cff365501be 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -2,7 +2,7 @@
 # This Makefile fragment is shared between the coreutils,
 # CPPI, Bison, and Autoconf.
 
-## Copyright (C) 2001-2007 Free Software Foundation, Inc.
+## Copyright (C) 2001-2008 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -617,10 +617,15 @@ rel-check:
        md5sum -c $$md5_tmp < $$tarz
 
 prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
+
+# FIXME: stop distributing xdelta files in 2008, unless someone speaks up.
+# So far, not one person has said they'd miss this.
 xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
 
 rel-files = $(xd-delta) $(DIST_ARCHIVES)
 
+gnulib-version = $$(cd $(gnulib_dir) && git describe)
+
 # Approximate the date of last gnulib "update" by the ChangeLog file's
 # mtime, and provide that date in the announcement.
 announcement: NEWS ChangeLog $(rel-files)
@@ -634,7 +639,7 @@ announcement: NEWS ChangeLog $(rel-files)
            --gpg-key-id=$(gpg_key_ID)                                  \
            --news=NEWS                                                 \
            --bootstrap-tools=autoconf,automake,bison,gnulib            \
-           --gnulib-snapshot-time-stamp="$$utc_date"                   \
+           --gnulib-version=$(gnulib-version)                          \
            $(addprefix --url-dir=, $(url_dir_list))
 
 ## ---------------- ##