Fix `make update' (was: FYI: more updated files)

[Ralf Wildenhues]

Hi Paul,

* Paul Eggert wrote on Mon, Apr 10, 2006 at 08:09:47PM CEST:
> Ralf Wildenhues <address@hidden> writes:
> 
> > First, we don't have a `bootstrap' script right now.
> 
> You're right, I'd forgotten.  Well, it's a real problem but it can
> wait until after 2.60 I guess.

Let's see.

> >  Running `make update' in the top level should make it all for you.
> > +Use liberally.
> 
> Well, now that we're on this subject, I don't understand this
> suggestion and I'm not sure I agree with it.  This is partly because
> "make update" does not work.

Yes.  I saw that, too, but now that you mention it, there is incentive
to fix it.  OK to apply?  (The patch below seems simple enough for me
to do so right now.)

> Worse, I can't check out the source code from CVS and expect it to
> work, even if everything is regenerated properly in CVS.

I'll look into this, and whether it's easy enough to fix right now.

Cheers,
Ralf

        * Makefile.maint (cvs-sv): New macro, to be used..
        (config.guess-url_prefix, config.sub-url_prefix)
        (texinfo.tex-url_prefix, standards.texi-url_prefix): ..here;
        point to CVS text checkout of Gnulib files.
        (copyright-check): Bump current year.
        (announcement): Do not hard-wire `./announce-gen'.
        (cvs-update): Do not fail if there was nothing to do.
        * Makefile.cfg (executable-update): Use `chmod a+x' instead of
        `chmod +x'.
        (wget_files): Update config.guess, config.sub, texinfo.tex by
        `wget-update', now that their URLs work again.

Index: Makefile.cfg
===================================================================
RCS file: /cvsroot/autoconf/autoconf/Makefile.cfg,v
retrieving revision 1.8
diff -u -r1.8 Makefile.cfg
--- Makefile.cfg        14 May 2005 07:00:39 -0000      1.8
+++ Makefile.cfg        10 Apr 2006 19:12:56 -0000
@@ -1,5 +1,5 @@
 # Customize Makefile.maint for Autoconf.            -*- Makefile -*-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006 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
@@ -34,11 +34,10 @@
 # Files to update automatically.
 wget_files = \
   $(srcdir)/doc/standards.texi \
-  $(srcdir)/doc/make-stds.texi
-#Currently done by hand:
-# $(srcdir)/config/config.guess
-# $(srcdir)/config/config.sub
-# $(srcdir)/config/texinfo.tex
+  $(srcdir)/doc/make-stds.texi \
+  $(srcdir)/config/config.guess \
+  $(srcdir)/config/config.sub \
+  $(srcdir)/config/texinfo.tex
 
 cvs_files = \
   $(srcdir)/config/elisp-comp \
@@ -53,7 +52,7 @@
 .PHONY: executable-update
 # autom4te-update is defined in Makefile.am.
 executable-update: wget-update cvs-update autom4te-update
-       chmod +x $(cvs_files)   \
+       chmod a+x $(cvs_files)   \
                 $(srcdir)/config/config.guess \
                 $(srcdir)/config/config.sub
 
Index: Makefile.maint
===================================================================
RCS file: /cvsroot/autoconf/autoconf/Makefile.maint,v
retrieving revision 1.35
diff -u -r1.35 Makefile.maint
--- Makefile.maint      6 Apr 2006 17:43:52 -0000       1.35
+++ Makefile.maint      10 Apr 2006 19:12:57 -0000
@@ -382,7 +382,7 @@
 # Make sure that the copyright date in $(v_etc_file) is up to date.
 copyright-check:
        @if test -f $(v_etc_file); then \
-         grep 'enum { COPYRIGHT_YEAR = 2005 };' $(v_etc_file) \
+         grep 'enum { COPYRIGHT_YEAR = 2006 };' $(v_etc_file) \
            >/dev/null \
          || { echo 'out of date copyright in $(v_etc_file); update it' 1>&2; \
               exit 1; }; \
@@ -484,7 +484,7 @@
 
 rel-files = $(xd-delta) $(DIST_ARCHIVES)
 announcement: NEWS ChangeLog $(rel-files)
-       @./announce-gen                                                 \
+       @$(announce_gen)                                                \
            --release-type=$(RELEASE_TYPE)                              \
            --package=$(PACKAGE)                                        \
            --prev=$(PREV_VERSION)                                      \
@@ -500,6 +500,7 @@
 
 ftp-gnu = ftp://ftp.gnu.org/gnu
 www-gnu = http://www.gnu.org
+cvs-sv  = http://cvs.savannah.gnu.org/viewcvs/~checkout~
 
 # Use mv, if you don't have/want move-if-change.
 move_if_change ?= move-if-change
@@ -550,14 +551,14 @@
 
 get-targets = $(patsubst %, get-%, $(wget_files))
 
-config.guess-url_prefix = $(ftp-gnu)/build-aux/
-config.sub-url_prefix = $(ftp-gnu)/build-aux/
+config.guess-url_prefix = $(cvs-sv)/config/config/
+config.sub-url_prefix = $(cvs-sv)/config/config/
 
 ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
 
-texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
+texinfo.tex-url_prefix = $(cvs-sv)/gnulib/gnulib/build-aux/
 
-standards.texi-url_prefix = $(www-gnu)/prep/
+standards.texi-url_prefix = $(cvs-sv)/gnulib/gnulib/doc/
 make-stds.texi-url_prefix = $(standards.texi-url_prefix)
 
 target = $(patsubst get-%, %, $@)
@@ -591,7 +592,7 @@
          $(CVS) -d $(automake_repo) co -p automake/lib/$$file> $$f.t   \
            && $(move_if_change) $$f.t $$f;                             \
        done;                                                           \
-       test "$$fail" && exit 1
+       if test "$$fail"; then exit 1; else :; fi
 
 emit_upload_commands:
        @echo =====================================