Synch to No Gnus 200604110611.

[elisp/gnus.git-] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 26a5d67..6f65a13 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,8 @@ EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \
                       dirs (cdr dirs)))) \
           (princ (or package-dir \"\")))" 2>/dev/null
 
+GZIP_PROG = gzip -f
+
 # # # # # # # # # # Release variables (for maintainer only):
 #
 # Files removed from `cvs export' output before creating the tar-ball:
@@ -280,6 +282,7 @@ release-bump-version:       release-check-settings
        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 ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/message.texi
+       sed -i -e 's,/[a-z]*gnus-[0-9.]*/,/$(CIN)gnus-$(VERSION)/,' README
        if [ "x$(CODENAME)" = "x" ]; then \
          sed -i -e '/The current release ($(OLD_PATTERN)) should/s,$(OLD_PATTERN),$(VERSION),' texi/gnus-faq.texi; \
        else \
@@ -322,11 +325,20 @@ release-files:    release-make-tar-ball release-diff
        @ls -l $(CIN)gnus-$(VERSION).tar.gz
        @ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
 
-release-files-signed:  release-files
-       read -sp "Enter pass phrase: " phrase ; \
+release-files-signed:  release-files release-sign-files
+
+# Sign prepared files:
+release-sign-files:
+       if [ "x$$GPG_AGENT_INFO" = "x" ]; then \
+         read -sp "Enter pass phrase: " phrase ; \
+         gpg_opt="--passphrase-fd 0"; \
+       else \
+         gpg_opt=""; phrase=""; \
+       fi; \
        for i in $(CIN)gnus-$(VERSION).tar.gz \
                 $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz; do \
-          echo "$$phrase" | gpg --passphrase-fd 0 --detach-sign $$i ; \
+          rm $$i.sig; \
+          echo "$$phrase" | gpg --detach-sign $$gpg_opt $$i; \
        done; true
        @ls -l $(CIN)gnus-$(VERSION).tar.gz{.sig,}
        @ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz{.sig,}
@@ -348,7 +360,7 @@ release-make-tar-ball:      $(CIN)gnus-$(VERSION)
 release-diff:  release-check-settings
        cvs diff -r $(OLD_TAG) -r $(TAG) | sed -e '/^\? /d' > temp.diff || true
        mv temp.diff $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
-       gzip         $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
+       $(GZIP_PROG) $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
        ls -l        $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
 
 release-post-clean:    release-check-settings