* Makefile.maint (announcement): Adjust so that it works with

announce-gen's --gnulib-snapshot-time-stamp option.
Indent one of the command lines using TAB, not 8 spaces.

diff --git a/ChangeLog b/ChangeLog
index 338cbadabc45dd1caca23b2c3b7d2820a184dbee..a1746d393fc6cf68aa515bfa59bc92abb6a15792 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-02-25  Jim Meyering  <jim@meyering.net>
 
+       * Makefile.maint (announcement): Adjust so that it works with
+       announce-gen's --gnulib-snapshot-time-stamp option.
+       Indent one of the command lines using TAB, not 8 spaces.
+
        Post-release version change.
        * NEWS: Add a line for 6.8+.
        * configure.ac (AC_INIT): Set new version string.

diff --git a/Makefile.maint b/Makefile.maint
index 271b0d4aeac9bed9bd60464f91b9b13d65c35e61..1cde1a4342b523aca7dd1aaa9ca7abee42f57776 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -565,11 +565,11 @@ xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
 rel-files = $(xd-delta) $(DIST_ARCHIVES)
 
 # Approximate date of last "update" by the date on the ChangeLog file.
-gnulib_snapshot_date = \
-  $$(date -u --date $$(stat --printf @%Y $(gnulib_dir)/ChangeLog) \
-     '+%Y-%m-%d %T %z')
+gnulib_snapshot_date = $$(date -u --date $$cl_date '+%Y-%m-%d %T %z')
 announcement: NEWS ChangeLog $(rel-files)
-       @./build-aux/announce-gen                                       \
+       @cl_date=$$(stat --printf @%Y $(gnulib_dir)/ChangeLog);         \
+       utc_date=$$(date -u --date $$cl_date '+%Y-%m-%d %T %z');        \
+       ./build-aux/announce-gen                                        \
            --release-type=$(RELEASE_TYPE)                              \
            --package=$(PACKAGE)                                        \
            --prev=$(PREV_VERSION)                                      \
@@ -577,7 +577,7 @@ announcement: NEWS ChangeLog $(rel-files)
            --gpg-key-id=$(gpg_key_ID)                                  \
            --news=NEWS                                                 \
            --bootstrap-tools=autoconf,automake,bison,gnulib            \
-            --gnulib-snapshot-date=$(gnulib_snapshot_date)             \
+           --gnulib-snapshot-time-stamp="$$utc_date"                   \
            $(addprefix --url-dir=, $(url_dir_list))
 
 ## ---------------- ##