Merge git://git.infradead.org/~dwmw2/khdrs-2.6

[linux-drm-fsl-dcu.git] / scripts / Makefile.build

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 02a7eea5fdbcb77221eca244d264d33c1eada5f5..e2ad2dccccdb70f387317c1ef91292b150e98150 100644 (file)
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -117,7 +117,7 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M]
 $(obj-m)              : quiet_modtag := [M]
 
 # Default for not multi-part modules
-modname = $(*F)
+modname = $(basetarget)
 
 $(multi-objs-m)         : modname = $(modname-multi)
 $(multi-objs-m:.o=.i)   : modname = $(modname-multi)
@@ -191,9 +191,10 @@ define rule_cc_o_c
        $(call echo-cmd,checksrc) $(cmd_checksrc)                         \
        $(call echo-cmd,cc_o_c) $(cmd_cc_o_c);                            \
        $(cmd_modversions)                                                \
-       scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > $(@D)/.$(@F).tmp;  \
+       scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' >    \
+                                                     $(dot-target).tmp;  \
        rm -f $(depfile);                                                 \
-       mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
+       mv -f $(dot-target).tmp $(dot-target).cmd
 endef
 
 # Built-in and composite module parts