2003-05-04 Roland McGrath <roland@redhat.com>

	* Makerules (+make-deps): Fix target matching.
	Use $(sed-remove-dotdot).

diff --git a/Makerules b/Makerules
index b8e7a9e..ef4658d 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -379,9 +379,9 @@ S-CPPFLAGS = -DASSEMBLER $(asm-CPPFLAGS)
 define +make-deps
 $(make-target-directory)
 $(+mkdep) $< $(if $(filter %.c,$<),$(CFLAGS)) \
-            $(CPPFLAGS) $($(patsubst .%,%,$(suffix $(<F)))-CPPFLAGS) | sed \
--e 's,$(subst .,\.,$*)\.o,$(foreach o,$(all-object-suffixes),$(@:.d=$o)) $@,' \
-$(sed-remove-objpfx) > $(@:.d=.T)
+            $(CPPFLAGS) $($(patsubst .%,%,$(suffix $(<F)))-CPPFLAGS) | sed -e\
+'s,$(subst .,\.,$(@F:.d=.o)),$(foreach o,$(all-object-suffixes),$(@:.d=$o)) $@,' \
+$(sed-remove-objpfx) $(sed-remove-dotdot) > $(@:.d=.T)
 mv -f $(@:.d=.T) $@ $(generate-md5)
 endef