Avoid double-slash in path names that depend on $(sharedir).

diff --git a/Makefile b/Makefile
index 0f7595552d6b13c3dda425ab4240cfb75ca4bea7..7ce248ea8fa602f32d0335d17b08c61821263f91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ STRIP ?= strip
 prefix = $(HOME)
 bindir = $(prefix)/bin
 gitexecdir = $(bindir)
-sharedir = $(prefix)/share/
+sharedir = $(prefix)/share
 template_dir = $(sharedir)/git-core/templates/
 ifeq ($(prefix),/usr)
 sysconfdir = /etc
@@ -845,6 +845,8 @@ git$X git.spec \
 
 %.o: %.c GIT-CFLAGS
        $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
+%.s: %.c GIT-CFLAGS
+       $(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
 %.o: %.S
        $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<