* config/announce-gen, GNUmakefile, Makefile.maint: Update from

CVS Bison.

diff --git a/ChangeLog b/ChangeLog
index d61cc7d42ed4d42b5088308072a72786245222e8..3c605208f74a27649b3f6a45fd9810f8f46ac52f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  Akim Demaille  <akim@epita.fr>
+
+       * config/announce-gen, GNUmakefile, Makefile.maint: Update from
+       CVS Bison.
+
 2003-08-25  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * bin/autoreconf.in (parse_args): Do not pass --no-force to

diff --git a/GNUmakefile b/GNUmakefile
index 17ad4a27be1bb49f891d1452946404f5ea87b4f8..7e67536c4bcc3abeb611a3a0427c4ddc6a20960e 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,7 +4,7 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003 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

diff --git a/Makefile.maint b/Makefile.maint
index 2ff6a72108d96e7f6ea3cc6fd17b69ce3209212e..376bc3eac2dffc1a46569ff2b478a50e020f6f29 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -347,6 +347,9 @@ my-distcheck: $(local-check)
        echo "$(distdir).tar.gz is ready for distribution"; \
        echo "========================"
 
+WGET = wget
+WGETFLAGS = -C off
+
 tgz-md5 = $(shell md5sum < $(my_distdir).tar.gz|sed 's/  -//')
 tgz-sha1 = $(shell sha1sum < $(my_distdir).tar.gz|sed 's/  -//')
 bz2-md5 = $(shell md5sum < $(my_distdir).tar.bz2|sed 's/  -//')
@@ -362,7 +365,7 @@ rel-check:
        md5_tmp=/tmp/rel-check-md5-$$$$; \
        set -e; \
        trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \
-       wget -q --output-document=$$tarz $(url); \
+       $(WGET) $(WGETFLAGS) -q --output-document=$$tarz $(url); \
        echo "$(md5)  -" > $$md5_tmp; \
        md5sum -c $$md5_tmp < $$tarz
 
@@ -391,7 +394,6 @@ announcement: NEWS ChangeLog $(rel-files) $(signatures)
 ## Updating files.  ##
 ## ---------------- ##
 
-WGET = wget
 ftp-gnu = ftp://ftp.gnu.org/gnu
 www-gnu = http://www.gnu.org
 
@@ -418,7 +420,8 @@ do-po-update:
        tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\
        rm -rf $$tmppo && \
        mkdir $$tmppo && \
-       (cd $$tmppo && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
+       (cd $$tmppo && \
+         $(WGET) $(WGETFLAGS) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
        cp $$tmppo/*.po po
        cd po && $(MAKE) update-po
        $(MAKE) po-check
@@ -435,10 +438,12 @@ po-update:
 # The following pseudo table associates a local directory and a URL
 # with each of the files that belongs to some other package and is
 # regularly updated from the specified URL.
-wget_files ?= $(srcdir)/config/config.guess \
-              $(srcdir)/config/config.sub \
-              $(srcdir)/src/ansi2knr.c \
-             $(srcdir)/config/texinfo.tex
+wget_files ?= \
+  $(srcdir)/config/config.guess \
+  $(srcdir)/config/config.sub \
+  $(srcdir)/config/texinfo.tex \
+  $(srcdir)/src/ansi2knr.c
+
 get-targets = $(patsubst %, get-%, $(wget_files))
 
 config.guess-url_prefix = $(ftp-gnu)/config/
@@ -456,12 +461,15 @@ url = $($(notdir $(target))-url_prefix)$(notdir $(target))
 
 .PHONY: $(get-targets)
 $(get-targets):
-       $(WGET) $(url) -O $(target).t \
+       $(WGET) $(WGETFLAGS) $(url) -O $(target).t \
          && $(move_if_change) $(target).t $(target)
 
-cvs_files ?= $(srcdir)/config/depcomp $(srcdir)/config/missing \
-            $(srcdir)/config/mkinstalldirs \
-             $(srcdir)/config/install-sh $(srcdir)/src/ansi2knr.c
+cvs_files ?= \
+  $(srcdir)/config/depcomp \
+  $(srcdir)/config/install-sh \
+  $(srcdir)/config/missing \
+  $(srcdir)/config/mkinstalldirs \
+  $(srcdir)/src/ansi2knr.c
 automake_repo=:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/automake
 .PHONY: wget-update
 wget-update: $(get-targets)

diff --git a/config/announce-gen b/config/announce-gen
index 7b8095aef53ab558d429897478afb96a8f337623..01e4047f75f602bab3ac81729fda3f6d621724d1 100755 (executable)
--- a/config/announce-gen
+++ b/config/announce-gen
@@ -226,11 +226,13 @@ sub print_changelog_deltas ($$)
   $fail
     and exit 1;
 
+  # The markup is escaped as <\# so that when this script is sent by
+  # mail (or part of a diff), Gnus is not triggered.
   print <<EOF;
 
 Subject: $my_distdir released
 
-<#secure method=pgpmime mode=sign>
+<\#secure method=pgpmime mode=sign>
 
 FIXME: put comments here
 
@@ -263,8 +265,10 @@ EOF
 
   print "\nHere are the MD5 and SHA1 signatures:\n";
   print "\n";
-  print "<#part type=text/plain filename=\"$tmp\" disposition=inline>\n"
-    . "<#/part>\n";
+  # The markup is escaped as <\# so that when this script is sent by
+  # mail (or part of a diff), Gnus is not triggered.
+  print "<\#part type=text/plain filename=\"$tmp\" disposition=inline>\n"
+    . "<\#/part>\n";
 
   open OUT, '>', $tmp
     or die "$ME: $tmp: cannot open for writing: $!\n";