Fix `fetch' target to match current upstream locations.

* Makefile.am (WGET_SV_CVS): Renamed from WGETSGO.
(WGET_SV_GIT_AC, WGET_SV_GIT_GL, WGET_GCC): New.
(fetch): Update to match current upstream locations.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 5c08371..bee5e00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.am (WGET_SV_CVS): Renamed from WGETSGO.
+       (WGET_SV_GIT_AC, WGET_SV_GIT_GL, WGET_GCC): New.
+       (fetch): Update to match current upstream locations.
+
 2008-01-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/automake.texi (DESTDIR, Built sources example): Fix wording.

diff --git a/Makefile.am b/Makefile.am
index 0e787a8..30e8053 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -358,7 +358,10 @@ path-check: distdir
 
 ## Program to use to fetch files.
 WGET = wget
-WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
+WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
+WGET_SV_GIT_AC = $(WGET) 'http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;hb=HEAD;f='
+WGET_SV_GIT_GL = $(WGET) 'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f='
+WGET_GCC = $(WGET) 'http://gcc.gnu.org/viewcvs/*checkout*/trunk/'
 
 ## Files that we fetch and which we compare against.
 ## FIXME should be a lot more here
@@ -376,12 +379,12 @@ fetch:
        mkdir Fetchdir
 ## If a get fails then that is a problem.
        (cd Fetchdir && \
-       $(WGETSGO)/config/config/config.guess; \
-       $(WGETSGO)/config/config/config.sub; \
-       $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex; \
-       $(WGETSGO)/autoconf/autoconf/INSTALL; \
-       $(WGETSGO)/gcc/gcc/config-ml.in; \
-       $(WGETSGO)/gcc/gcc/symlink-tree)
+       $(WGET_SV_CVS)config/config/config.guess -O config.guess && \
+       $(WGET_SV_CVS)config/config/config.sub -O config.sub && \
+       $(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
+       $(WGET_SV_GIT_GL)doc/INSTALL -O INSTALL && \
+       $(WGET_GCC)config-ml.in -O config-ml.in && \
+       $(WGET_GCC)symlink-tree -O symlink-tree)
 ## Don't exit after test because we want to give as many errors as
 ## possible.
        @stat=0; for file in $(FETCHFILES); do \

diff --git a/Makefile.in b/Makefile.in
index 24e5abc..657cdbf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -214,7 +214,10 @@ do_subst = sed \
   -e 's,[@]datadir[@],$(datadir),g'
 
 WGET = wget
-WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
+WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
+WGET_SV_GIT_AC = $(WGET) 'http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;hb=HEAD;f='
+WGET_SV_GIT_GL = $(WGET) 'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f='
+WGET_GCC = $(WGET) 'http://gcc.gnu.org/viewcvs/*checkout*/trunk/'
 FETCHFILES = \
 INSTALL \
 config-ml.in \
@@ -932,12 +935,12 @@ fetch:
        rm -rf Fetchdir > /dev/null 2>&1
        mkdir Fetchdir
        (cd Fetchdir && \
-       $(WGETSGO)/config/config/config.guess; \
-       $(WGETSGO)/config/config/config.sub; \
-       $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex; \
-       $(WGETSGO)/autoconf/autoconf/INSTALL; \
-       $(WGETSGO)/gcc/gcc/config-ml.in; \
-       $(WGETSGO)/gcc/gcc/symlink-tree)
+       $(WGET_SV_CVS)config/config/config.guess -O config.guess && \
+       $(WGET_SV_CVS)config/config/config.sub -O config.sub && \
+       $(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
+       $(WGET_SV_GIT_GL)doc/INSTALL -O INSTALL && \
+       $(WGET_GCC)config-ml.in -O config-ml.in && \
+       $(WGET_GCC)symlink-tree -O symlink-tree)
        @stat=0; for file in $(FETCHFILES); do \
          if diff -u $(srcdir)/lib/$$file Fetchdir/$$file \
                  >>Fetchdir/update.patch 2>/dev/null; then :; \