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 60840b5ec5171f768866b646a08d4c56e37c4aaf..08984c78e716c25a8d90c7a3066d7f376c63d2bb 100644 (file)
--- 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 2e77741ed2e776d65624a32710f0f6e7490e50dd..b6af6902754591ff0486012b602958f81b53863a 100755 (executable)
--- 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 2e77741ed2e776d65624a32710f0f6e7490e50dd..b6af6902754591ff0486012b602958f81b53863a 100755 (executable)
--- 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