summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.maint3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a93375a8..73c5596f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-12-01 Jim Meyering <meyering@redhat.com>
+ Defer NEWS and ChangeLog checks until after the version-changing tag.
+ * Makefile.maint (alpha beta major): Don't depend on the
+ news-date-check changelog-check targets. They must fail before
+ applying the version-changing tag. Instead, run them after "vc-dist".
+
* NEWS: Record release date and new version number.
Mention some of the SELinux changes.
* src/stat.c (main): Adjust a comment.
diff --git a/Makefile.maint b/Makefile.maint
index c8d4fec8d..e5b4e0b9a 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -679,12 +679,13 @@ $(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz
xdelta delta -9 $^ $@ || :
.PHONY: alpha beta major
-alpha beta major: news-date-check changelog-check $(local-check) writable-files
+alpha beta major: $(local-check) writable-files
test $@ = major \
&& { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \
|| { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\
|| :
$(MAKE) vc-dist
+ $(MAKE) news-date-check changelog-check
$(MAKE) $(xd-delta)
$(MAKE) -s announcement RELEASE_TYPE=$@ > /tmp/announce-$(my_distdir)
ln $(rel-files) $(release_archive_dir)