From: Akim Demaille Date: Tue, 13 Mar 2001 12:09:22 +0000 (+0000) Subject: * tests/tools.at: Be sure to remove configure.ac~. X-Git-Tag: autoconf-2.50~99 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38fa78538d296f6281984f3c5e6237e2ab5b90fa;p=thirdparty%2Fautoconf.git * 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 fb66f5a1c..bb6e09e93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-03-13 Akim Demaille + + * tests/tools.at: Be sure to remove configure.ac~. + +2001-03-13 Raja R Harinath + + * autoupdate.in (File::Basename): Use package. + (%ac_macros, %au_macros): Save only base filenames. + 2001-03-08 Akim Demaille * acgeneral.m4 (AC_OUTPUT): In the AU_DEFUN definition, don't try diff --git a/autoupdate.in b/autoupdate.in index 867834b95..734306089 100644 --- 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 () { 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 867834b95..734306089 100644 --- 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 () { 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 867834b95..734306089 100644 --- 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 () { 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 e4c9dfc8f..a5ea239df 100644 --- 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 23f727a3a..bbafc5490 100644 --- 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 61a844a01..f8d981d1b 100644 --- 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 dcb981142..80fe21bb5 100644 --- 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