* Makefile.am (FETCHFILES, fetch): Do not fetch lib/Automake/XFile.pm

and lib/Automake/Struct.pm from Autoconf.
* lib/Automake/XFile.pm: Update comment, Automake is now
the master for this file.  Cosmetic changes.

diff --git a/ChangeLog b/ChangeLog
index 04332021d0bbe22cdc520d13be137b71d54f9dda..01fcb06e7142d4dccd2698f38d0af08f7fa5e23e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-13  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * Makefile.am (FETCHFILES, fetch): Do not fetch lib/Automake/XFile.pm
+       and lib/Automake/Struct.pm from Autoconf.
+       * lib/Automake/XFile.pm: Update comment, Automake is now
+       the master for this file.  Cosmetic changes.
+
 2003-09-09  Akim Demaille  <akim@epita.fr>
 
        * lib/Automake/FileUtils.pm (&update_file): s/cannot not/cannot/g.

diff --git a/HACKING b/HACKING
index 84288790b5fa33e25fd1da7446eba1436964c4a5..dbf6b2f78169df47ec3c480c08632f575de4d3ba 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -31,7 +31,6 @@
       INSTALL (autoconf-patches@gnu.org),
       config.guess, config.sub (config-patches@gnu.org),
       texinfo.tex (bug-texinfo@gnu.org),
-      Struct.pm, XFile.pm (autoconf-patches@gnu.org).
   Most of them are updated before release with `make fetch'.
 
 * Changes other than bug fixes must be mentioned in NEWS
@@ -137,7 +136,8 @@
   If not an alpha, announcement must also go to FSF:
   Put the files on a public ftp site and send a message to
   ftp-upload@gnu.org.
-  Then send the announcement to info-gnu@gnu.org.
+  Then send the announcement at least to info-gnu@gnu.org,
+  autotools-announce@gnu.org, and automake@gnu.org.
 
 * Update version number in configure.in to next alpha number.
   Re-run autoconf and commit.

diff --git a/Makefile.am b/Makefile.am
index 1673fd6c3abae52b92b0bbafd26c6ad6de0642e2..23a0f0ec8b7a0282715b4c9df527a10c69ee0453 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -286,8 +286,6 @@ WGET = wget
 ## Files that we fetch and which we compare against.
 ## FIXME should be a lot more here
 FETCHFILES = \
-Automake/Struct.pm \
-Automake/XFile.pm \
 INSTALL \
 config-ml.in \
 config.guess \
@@ -298,14 +296,12 @@ texinfo.tex
 ## Fetch the latest versions of files we care about.
 fetch:
        rm -rf Fetchdir > /dev/null 2>&1
-       mkdir Fetchdir; mkdir Fetchdir/Automake
+       mkdir Fetchdir
 ## If a get fails then that is a problem.
        (cd Fetchdir && \
        $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess; \
        $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub; \
        $(WGET) ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex; \
-       $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/lib/Autom4te/Struct.pm?content-type=text/plain -O Automake/Struct.pm; \
-       $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/lib/Autom4te/XFile.pm?content-type=text/plain -O Automake/XFile.pm; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/INSTALL?content-type=text/plain -O INSTALL; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/gcc/gcc/config-ml.in; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/gcc/gcc/symlink-tree)

diff --git a/Makefile.in b/Makefile.in
index 3b2f571eac9d6e79de7b88645af57053ec711baa..fbde9e8458a22f0f032154c7609423195d2553b5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -175,8 +175,6 @@ do_subst = sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]PERL[@],$(PERL),g' \
 
 WGET = wget
 FETCHFILES = \
-Automake/Struct.pm \
-Automake/XFile.pm \
 INSTALL \
 config-ml.in \
 config.guess \
@@ -923,13 +921,11 @@ path-check: distdir
 
 fetch:
        rm -rf Fetchdir > /dev/null 2>&1
-       mkdir Fetchdir; mkdir Fetchdir/Automake
+       mkdir Fetchdir
        (cd Fetchdir && \
        $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess; \
        $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub; \
        $(WGET) ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex; \
-       $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/lib/Autom4te/Struct.pm?content-type=text/plain -O Automake/Struct.pm; \
-       $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/lib/Autom4te/XFile.pm?content-type=text/plain -O Automake/XFile.pm; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/INSTALL?content-type=text/plain -O INSTALL; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/gcc/gcc/config-ml.in; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/gcc/gcc/symlink-tree)

diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 06bb55879cbbb1a9bb2be70b52228a0325003d20..c2b3e63d4c71eb81bf1e413408c513007888de4e 100644 (file)
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -18,8 +18,8 @@
 # Written by Akim Demaille <akim@freefriends.org>.
 
 ###############################################################
-# The main copy of this file is in Autoconf's CVS repository. #
-# Updates should be sent to autoconf-patches@gnu.org.         #
+# The main copy of this file is in Automake's CVS repository. #
+# Updates should be sent to automake-patches@gnu.org.         #
 ###############################################################
 
 package Automake::XFile;
@@ -33,7 +33,7 @@ Automake::XFile - supply object methods for filehandles with error handling
     use Automake::XFile;
 
     $fh = new Automake::XFile;
-    $fh->open("< file"))
+    $fh->open ("< file");
     # No need to check $FH: we died if open failed.
     print <$fh>;
     $fh->close;
@@ -50,12 +50,12 @@ Automake::XFile - supply object methods for filehandles with error handling
     print <$fh>;
     undef $fh;   # automatically closes the file and checks for errors.
 
-    $fh = new Automake::XFile "file", O_WRONLY|O_APPEND;
+    $fh = new Automake::XFile "file", O_WRONLY | O_APPEND;
     # No need to check $FH: we died if new failed.
     print $fh "corge\n";
 
     $pos = $fh->getpos;
-    $fh->setpos($pos);
+    $fh->setpos ($pos);
 
     undef $fh;   # automatically closes the file and checks for errors.
 
@@ -119,7 +119,7 @@ my $me = basename ($0);
 sub new
 {
   my $type = shift;
-  my $class = ref($type) || $type || "Automake::XFile";
+  my $class = ref $type || $type || "Automake::XFile";
   my $fh = $class->SUPER::new ();
   if (@_)
     {
@@ -134,7 +134,7 @@ sub new
 
 sub open
 {
-  my ($fh) = shift;
+  my $fh = shift;
   my ($file) = @_;
 
   # WARNING: Gross hack: $FH is a typeglob: use its hash slot to store
@@ -161,7 +161,7 @@ sub open
 
 sub close
 {
-  my ($fh) = shift;
+  my $fh = shift;
   if (!$fh->SUPER::close (@_))
     {
       my $file = $fh->name;
@@ -204,7 +204,7 @@ sub getlines
 
 sub name
 {
-  my ($fh) = shift;
+  my $fh = shift;
   return ${*$fh}{'autom4te_xfile_file'};
 }
 
@@ -229,7 +229,7 @@ sub lock
 
 sub seek
 {
-  my ($fh) = shift;
+  my $fh = shift;
   # Cannot use @_ here.
   if (!seek ($fh, $_[0], $_[1]))
     {