* tests/tools.at: Be sure to remove configure.ac~.

* autoupdate.in (File::Basename): Use package.
(%ac_macros, %au_macros): Save only base filenames.

diff --git a/ChangeLog b/ChangeLog
index fb66f5a1c6ceebcdcfc99e0fe5e35a28151b8f53..bb6e09e93b442cf58a63e65a5e6130c7296b47f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-03-13  Akim Demaille  <akim@epita.fr>
+
+       * tests/tools.at: Be sure to remove configure.ac~.
+
+2001-03-13  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * autoupdate.in (File::Basename): Use package.
+       (%ac_macros, %au_macros): Save only base filenames.
+
 2001-03-08  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (AC_OUTPUT): In the AU_DEFUN definition, don't try

diff --git a/autoupdate.in b/autoupdate.in
index 867834b953a68061e46fc3940ffa5c8f7fd0b9ce..734306089981fa705aa2b0332930e8b883e09c26 100644 (file)
--- a/autoupdate.in
+++ b/autoupdate.in
@@ -22,6 +22,7 @@
 
 require 5.005;
 use Getopt::Long;
+use File::Basename;
 use strict;
 
 (my $me = $0) =~ s,.*[\\/],,;
@@ -276,13 +277,14 @@ while (<MACROS>)
   {
     chomp;
     /^(AC|AU):(.*):([^:]*)$/ or next;
+    my $filename = basename ($2);
     if ($1 eq "AC")
       {
-       $ac_macros{$3} = $2;
+       $ac_macros{$3} = $filename;
       }
     else
       {
-       $au_macros{$3} = $2;
+       $au_macros{$3} = $filename;
       }
   }
 close MACROS

diff --git a/autoupdate.sh b/autoupdate.sh
index 867834b953a68061e46fc3940ffa5c8f7fd0b9ce..734306089981fa705aa2b0332930e8b883e09c26 100644 (file)
--- a/autoupdate.sh
+++ b/autoupdate.sh
@@ -22,6 +22,7 @@
 
 require 5.005;
 use Getopt::Long;
+use File::Basename;
 use strict;
 
 (my $me = $0) =~ s,.*[\\/],,;
@@ -276,13 +277,14 @@ while (<MACROS>)
   {
     chomp;
     /^(AC|AU):(.*):([^:]*)$/ or next;
+    my $filename = basename ($2);
     if ($1 eq "AC")
       {
-       $ac_macros{$3} = $2;
+       $ac_macros{$3} = $filename;
       }
     else
       {
-       $au_macros{$3} = $2;
+       $au_macros{$3} = $filename;
       }
   }
 close MACROS

diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index 867834b953a68061e46fc3940ffa5c8f7fd0b9ce..734306089981fa705aa2b0332930e8b883e09c26 100644 (file)
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -22,6 +22,7 @@
 
 require 5.005;
 use Getopt::Long;
+use File::Basename;
 use strict;
 
 (my $me = $0) =~ s,.*[\\/],,;
@@ -276,13 +277,14 @@ while (<MACROS>)
   {
     chomp;
     /^(AC|AU):(.*):([^:]*)$/ or next;
+    my $filename = basename ($2);
     if ($1 eq "AC")
       {
-       $ac_macros{$3} = $2;
+       $ac_macros{$3} = $filename;
       }
     else
       {
-       $au_macros{$3} = $2;
+       $au_macros{$3} = $filename;
       }
   }
 close MACROS

diff --git a/man/autoupdate.1 b/man/autoupdate.1
index e4c9dfc8f33f9ecccb7daccb41ea6fb37eadd17e..a5ea239df3dd05cf70b0cadf5db28c9db02999d3 100644 (file)
--- a/man/autoupdate.1
+++ b/man/autoupdate.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOUPDATE "1" "February 2001" "autoupdate " FSF
+.TH AUTOUPDATE "1" "March 2001" "autoupdate " FSF
 .SH NAME
 autoupdate \- Update a configure.in to a newer Autoconf
 .SH SYNOPSIS

diff --git a/man/config.guess.1 b/man/config.guess.1
index 23f727a3a82ee6d5acb35e33b1726657e6988566..bbafc549099a91a829c92955bf92adeba76f8288 100644 (file)
--- a/man/config.guess.1
+++ b/man/config.guess.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH CONFIG.GUESS "1" "January 2001" "GNU config.guess (2001-01-17)" FSF
+.TH CONFIG.GUESS "1" "March 2001" "GNU config.guess (2001-03-06)" FSF
 .SH NAME
 config.guess \- guess the build system triplet
 .SH SYNOPSIS

diff --git a/man/config.sub.1 b/man/config.sub.1
index 61a844a01bab79158d830910a96a6be2102dc824..f8d981d1ba1570d10c61882e9d44ec5e54ad0d1e 100644 (file)
--- a/man/config.sub.1
+++ b/man/config.sub.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH CONFIG.SUB "1" "January 2001" "GNU config.sub (2001-01-12)" FSF
+.TH CONFIG.SUB "1" "March 2001" "GNU config.sub (2001-02-16)" FSF
 .SH NAME
 config.sub \- validate and canonicalize a configuration triplet
 .SH SYNOPSIS

diff --git a/tests/tools.at b/tests/tools.at
index dcb981142f09ce011f97e3db6771825cd4b65ada..80fe21bb5ae33d6414dc9378c4c454b7e6c17c8d 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -440,7 +440,7 @@ AT_CHECK([autoupdate --autoconf-dir $top_srcdir], 0, [],
 ])
 AT_CHECK([cat configure.ac], 0, [expout])
 
-AT_CLEANUP
+AT_CLEANUP(configure.ac~)
 
 
 # autoupdating AC_LINK_FILES
@@ -469,7 +469,7 @@ AT_CHECK([cat src1], 0, [dst1
 AT_CHECK([cat src2], 0, [dst2
 ])
 
-AT_CLEANUP(src1 src2)
+AT_CLEANUP(src1 src2 configure.ac~)
 
 
 # autoupdating AC_PREREQ