diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-28 23:59:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-28 23:59:36 (GMT) |
| commit | 371276bf29314af04b804cfd877abcac62674a58 (patch) | |
| tree | 1c379eceeb15e83f81ed4f54d6af7c77d9819a50 /Makefile | |
| parent | ff9c0825cfb1840238b6019dddb52763ed96fc82 (diff) | |
| parent | 70b89f871e1afa1fe3ffa22bf3e2043d4405954a (diff) | |
| download | git-371276bf29314af04b804cfd877abcac62674a58.zip git-371276bf29314af04b804cfd877abcac62674a58.tar.gz git-371276bf29314af04b804cfd877abcac62674a58.tar.bz2 | |
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0:
Makefile: reenable install with NO_CURL
Diffstat (limited to 'Makefile')
| -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: |