* automake.in: Use File::Basename.

(&dirname, &basename): Remove.

diff --git a/ChangeLog b/ChangeLog
index badf2e2cacc02eaedd624bd82402daa20e0f2ea9..2ebff2e17576085c897f6e1aee331dc691dc0135 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-26  Akim Demaille  <akim@epita.fr>
+
+       * automake.in: Use File::Basename.
+       (&dirname, &basename): Remove.
+
+       
 2001-02-26  Akim Demaille  <akim@epita.fr>
 
        * automake.in ($me): New.

diff --git a/automake.in b/automake.in
index 7466de2665f2d9d90a65bbc1c02e6efb4f2529b2..2b1859d38e47077a9520307aa77ac23fb997df3d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -29,9 +29,10 @@ eval 'exec @PERL@ -S $0 ${1+"$@"}'
 
 require 5.005;
 
+use File::Basename;
 use IO::File;
 
-(my $me = $0) =~ s,.*[\\/],,;
+my $me = basename ($0);
 
 # Parameters set by configure.  Not to be changed.  NOTE: assign
 # VERSION as string so that eg version 0.30 will print correctly.
@@ -470,34 +471,6 @@ sub uniq (@)
 
 ################################################################
 
-# $DIRNAME
-# &dirname ($FILE)
-# ----------------
-# Return directory name of file.
-sub dirname ($)
-{
-    my ($file) = @_;
-    my $sub;
-
-    ($sub = $file) =~ s,/+[^/]+$,,g;
-    $sub = '.' if $sub eq $file;
-    return $sub;
-}
-
-
-# $BASENAME
-# &basename ($FILE)
-# -----------------
-# Return file name of a file.
-sub basename ($)
-{
-    my ($file) = @_;
-    my $sub;
-
-    ($sub = $file) =~s,^.*/+,,g;
-    return $sub;
-}
-
 
 # $BACKPATH
 # &backname ($REL-DIR)