This is the mail archive of the automake@gnu.org mailing list for the automake project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

75-use-basename.patch


Index: ChangeLog
from  Akim Demaille  <akim@epita.fr>
	* automake.in: Use File::Basename.
	(&dirname, &basename): Remove.
	
	
Index: automake.in
--- automake.in Sun, 25 Feb 2001 14:54:59 +0100 akim (am/f/39_automake.i 1.81 755)
+++ automake.in Sun, 25 Feb 2001 22:05:22 +0100 akim (am/f/39_automake.i 1.81 755)
@@ -28,8 +28,9 @@
 # Perl reimplementation by Tom Tromey <tromey@cygnus.com>.
 
 require 5.005;
+use File::Basename;
 
-(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.
@@ -451,34 +452,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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]