From: Tom Tromey <tromey@redhat.com>
Date: Sun, 20 Aug 2000 15:58:45 +0000 (+0000)
Subject: 2000-08-20  Eli Zaretskii  <eliz@is.elta.co.il>
X-Git-Tag: Release-1-4b~62
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=057bb269543c3450bbf0297a9eb1e102662e4577;p=automake.git

2000-08-20  Eli Zaretskii  <eliz@is.elta.co.il>

	* depcomp (gcc): Support DOS-style absolute file names with drive
	letters.
---

diff --git a/ChangeLog b/ChangeLog
index 60840b5e..08984c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-20  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* depcomp (gcc): Support DOS-style absolute file names with drive
+	letters.
+
 2000-08-06  Jim Meyering  <meyering@lucent.com>
 
 	* automake.in (handle_dependencies): Set $require_file_found{'depcomp'}
diff --git a/depcomp b/depcomp
index 2e77741e..b6af6902 100755
--- a/depcomp
+++ b/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,7 +69,10 @@ gcc)
   fi
   rm -f "$depfile" 
   echo "$object : \\" > "$depfile"
-  sed 's/^[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the `deleted header file' problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
diff --git a/lib/depcomp b/lib/depcomp
index 2e77741e..b6af6902 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,7 +69,10 @@ gcc)
   fi
   rm -f "$depfile" 
   echo "$object : \\" > "$depfile"
-  sed 's/^[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the `deleted header file' problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is