summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-28 16:59:42 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-28 16:59:42 -0700
commit81fa024cd8e336ba257f13fe7724b95baacfa3ad (patch)
tree69029df797195eb186535d82bbaadb8e7ed03712 /Makefile
parentd0b16c8f878bef5c1268e033a3d1f427498c7008 (diff)
parent371276bf29314af04b804cfd877abcac62674a58 (diff)
downloadgit-81fa024cd8e336ba257f13fe7724b95baacfa3ad.tar.gz
Merge branch 'maint'
* maint: Makefile: reenable install with NO_CURL completion: --set-upstream option for git-branch get_cwd_relative(): do not misinterpret suffix as subdirectory
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 07cab8f6a4..d5d6565c86 100644
--- a/Makefile
+++ b/Makefile
@@ -2008,12 +2008,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-gitweb: