From: Richard Levitte <levitte@openssl.org>
Date: Wed, 10 Oct 2001 08:27:28 +0000 (+0000)
Subject: It seems like gcc does canonicalisation of file names.  More
X-Git-Tag: OpenSSL_0_9_6c~26^2~136
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=3009e9f9ef196829befec5b96730747bb24dd120;ds=sidebyside

It seems like gcc does canonicalisation of file names.  More
specifically, a starting './' is removed.  makedepend doesn't do this,
resulting in another possible commit war, so let's fix that by doing a
poor mans canonicalisation of file names that gives the same effect as
doing dependencies through gcc.
---

diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index 322bfcc582..6c485d1e2f 100755
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -34,9 +34,11 @@ foreach $file (sort keys %files) {
     my $dep;
     my $origfile=$file;
     $origfile=~s/\.o$/.c/;
+    $file=~s/^\.\///;
     push @{$files{$file}},$origfile;
     my $prevdep="";
     foreach $dep (sort @{$files{$file}}) {
+	$dep=~s/^\.\///;
 	next if $prevdep eq $dep; # to exterminate duplicates...
 	$prevdep = $dep;
 	$len=0 if $len+length($dep)+1 >= 80;