From f03ceab13d027d39ee64b4fd3b0f4ad15765f159 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 18 Feb 2003 23:28:42 +0000 Subject: [PATCH] * lib/depcomp (dashmstdout): Cope with DOS filenames in dependencies. --- ChangeLog | 5 +++++ lib/depcomp | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e945e2c0a..6d12a7cb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-02-18 Richard Dawe + + * lib/depcomp (dashmstdout): Cope with DOS filenames in + dependencies. + 2003-02-17 Alexandre Duret-Lutz * lib/depcomp (makedepend): Don't pass $object to makedepend. diff --git a/lib/depcomp b/lib/depcomp index 3f5d1d500..51606f8c4 100755 --- a/lib/depcomp +++ b/lib/depcomp @@ -315,7 +315,11 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' -- 2.47.2