From: Jim Meyering <jim@meyering.net>
Date: Sun, 25 Feb 2007 00:11:32 +0000 (+0100)
Subject: * Makefile.maint (announcement): Adjust so that it works with
X-Git-Tag: COREUTILS-6_9~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=898d3df2f803f9d8c6967affee6a0e4ae6f89f13;p=thirdparty%2Fcoreutils.git

* 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 338cbadabc..a1746d393f 100644
--- 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 271b0d4aea..1cde1a4342 100644
--- 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))
 
 ## ---------------- ##