From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Aug 2012 22:39:38 +0000 (-0700)
Subject: Merge branch 'jn/make-assembly-in-right-directory' into maint
X-Git-Tag: v1.7.12-rc2~2^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dbf64e125a96cd9e6de401361613e8dc888c65ee?hp=c2e585f530e6339ff3eab0405de6286b7f929b28

Merge branch 'jn/make-assembly-in-right-directory' into maint

* jn/make-assembly-in-right-directory:
Makefile: fix location of listing produced by "make subdir/foo.s"
---

diff --git a/Makefile b/Makefile
index 67d761e83a..3019b01d50 100644
--- a/Makefile
+++ b/Makefile
@@ -2209,7 +2209,7 @@ $(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs)
 endif
 
 %.s: %.c GIT-CFLAGS FORCE
-	$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+	$(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
 
 ifdef USE_COMPUTED_HEADER_DEPENDENCIES
 # Take advantage of gcc's on-the-fly dependency generation