X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=Makefile.in;h=9e1466d1e5191f9cd361798b31f3d131747cc1ca;hp=36caec048409992acc034853f4c4eb8466c31198;hb=828982bb6d18f42994d348f8840729419c194d28;hpb=1ce75afd0ff1f8b6c03af28d800f7aa4d0592e53

diff --git a/Makefile.in b/Makefile.in
index 36caec048..9e1466d1e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -116,11 +116,15 @@ release-check-settings:
 
 # Needs GNU grep and a recent GNU sed:
 release-bump-version:	release-check-settings
-	sed -i -e '/^(defconst gnus-version-number /s|"$(OLD_PATTERN)"|"$(VERSION)"|' lisp/gnus.el
-	sed -i -e '/^.newcommand{.gnusversionname}{Gnus v/s|$(OLD_PATTERN)|$(VERSION)|' texi/gnus.texi
-	sed -i -e '/^This manual corresponds to Gnus v/s|$(OLD_PATTERN)|$(VERSION)|' texi/gnus.texi
-	sed -i -e '/^This manual corresponds to Message v/s|$(OLD_PATTERN)|$(VERSION)|' texi/message.texi
-	sed -i -e '/The current release ($(OLD_PATTERN)) should/s|$(OLD_PATTERN)|$(VERSION)|' texi/gnus-faq.texi
+	sed -i -e '/^(defconst gnus-version-number /s,"$(OLD_PATTERN)","$(VERSION)",' lisp/gnus.el
+	sed -i -e '/^.newcommand{.gnusversionname}{Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
+	sed -i -e '/^This manual corresponds to [A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
+	sed -i -e '/^corresponding to this manual is [A-Za-z ]*Gnusv/s,$(OLD_PATTERN),$(VERSION),' texi/message.texi
+	if [ "x$(CODENAME)" = "x" ]; then \
+	  sed -i -e '/The current release ($(OLD_PATTERN)) should/s,$(OLD_PATTERN),$(VERSION),' texi/gnus-faq.texi; \
+	else \
+	  true; \
+	fi
 	@if grep -q "$(CODENAME)Gnus v$(VERSION) is released" texi/ChangeLog; then \
 	  echo "texi/ChangeLog is already updated"; \
 	else \
@@ -133,9 +137,9 @@ release-bump-version:	release-check-settings
 	fi
 	cvs diff -U0 $(RELEASE_COMMIT_FILES); sleep 2
 
-release-revert-changelog:
-	rm -i      lisp/ChangeLog texi/ChangeLog
-	cvs update lisp/ChangeLog texi/ChangeLog
+release-revert-files:
+	rm -i      $(RELEASE_COMMIT_FILES)
+	cvs update $(RELEASE_COMMIT_FILES)
 
 release-commit:	release-check-settings
 	@echo -e '\007'
@@ -176,7 +180,7 @@ README:
 # Make a diff between current and previous release.  Example:
 # ftp://quimby.gnus.org/pub/gnus/ding-patches/gnus-5.10.5-5.10.6.diff.gz
 release-diff:	release-check-settings
-	cvs diff -r $(OLD_TAG) -r $(TAG) > temp.diff || true
+	cvs diff -r $(OLD_TAG) -r $(TAG) | sed -e '/^\? /d' > temp.diff || true
 	mv temp.diff gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
 	gzip         gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
 	ls -l        gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz