From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jul 2010 19:06:11 +0000 (-0700)
Subject: Merge branch 'bc/maint-makefile-fixes'
X-Git-Tag: v1.7.2~28
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aa57328d60f5d5a5f74d1d336caf06b6bdf4fd03;p=git.git

Merge branch 'bc/maint-makefile-fixes'

* bc/maint-makefile-fixes:
  Makefile: work around ksh's failure to handle missing list argument to for loop
  Makefile: remove some unnecessary curly braces
---

aa57328d60f5d5a5f74d1d336caf06b6bdf4fd03
diff --cc Makefile
index 9aca8a16d,78f2cd677..bc3c57058
--- a/Makefile
+++ b/Makefile
@@@ -2091,12 -2016,9 +2091,12 @@@ endi
  		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
  		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
- 	  done; } ; } && \
+ 	done && \
  	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
  
 +install-gitweb:
 +	$(MAKE) -C gitweb install
 +
  install-doc:
  	$(MAKE) -C Documentation install