diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-05-28 16:59:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-28 16:59:36 -0700 |
| commit | 371276bf29314af04b804cfd877abcac62674a58 (patch) | |
| tree | 1c379eceeb15e83f81ed4f54d6af7c77d9819a50 | |
| parent | completion: --set-upstream option for git-branch (diff) | |
| parent | Makefile: reenable install with NO_CURL (diff) | |
| download | tgif-371276bf29314af04b804cfd877abcac62674a58.tar.xz | |
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0:
Makefile: reenable install with NO_CURL
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1996,12 +1996,13 @@ endif ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ done; } && \ - { for p in $(REMOTE_CURL_ALIASES); do \ + { test x"$(REMOTE_CURL_ALIASES)" = x || \ + { for p in $(REMOTE_CURL_ALIASES); do \ $(RM) "$$execdir/$$p" && \ 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-doc: |