summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.cfg6
-rw-r--r--Makefile.maint4
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ca2a2f5fa..03c8fbe56 100644
--- 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 d1116bc66..7ade5215a 100644
--- 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 fa2ceb673..1dd34401a 100644
--- 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) \