Clean up build-related rules.

* Makefile.cfg (gnulib_dir): Update comment.
* Makefile.maint (announcement) [cl_date, utc_date]: Don't set
now-unused variables.

diff --git a/ChangeLog b/ChangeLog
index ca2a2f5faf2a13f587fad13be48f404d27111594..03c8fbe563497d3067573b63a441e49386909309 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-01-23  Jim Meyering  <meyering@redhat.com>
 
+       Clean up build-related rules.
+       * Makefile.cfg (gnulib_dir): Update comment.
+       * Makefile.maint (announcement) [cl_date, utc_date]: Don't set
+       now-unused variables.
+
        * TODO: Update the note on getgrouplist.
 
 2008-01-23  Zvi Har'El  <rl@math.technion.ac.il>

diff --git a/Makefile.cfg b/Makefile.cfg
index d1116bc668548de5a096dfc89953fc0c15f6aae6..7ade5215ad869a74bf1dc91e2ca956ac6a08ebb0 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -1,5 +1,5 @@
 # Customize Makefile.maint.                           -*- makefile -*-
-# Copyright (C) 2003-2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-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
@@ -33,6 +33,6 @@ gpg_key_ID = B9AB9A16
 # at the top of the file for each `make distcheck' run.
 local-checks-to-skip = changelog-check strftime-check
 
-# The local directory containing the checked-out copy of gnulib used in
-# this release.  Used solely to get a date for the "announcement" target.
+# The local directory containing the checked-out copy of gnulib used in this
+# release.  Used solely to get gnulib's SHA1 for the "announcement" target.
 gnulib_dir = /gnulib

diff --git a/Makefile.maint b/Makefile.maint
index fa2ceb673bba0ebe58f2090b349d4cff365501be..1dd34401a3edd4d0f33e991827e2bf62a875143f 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -629,9 +629,7 @@ 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)
-       @cl_date=$$(stat --printf @%Y $(gnulib_dir)/ChangeLog);         \
-       utc_date=$$(date -u --date $$cl_date '+%Y-%m-%d %T %z');        \
-       ./build-aux/announce-gen                                        \
+       @./build-aux/announce-gen                                       \
            --release-type=$(RELEASE_TYPE)                              \
            --package=$(PACKAGE)                                        \
            --prev=$(PREV_VERSION)                                      \