Code

Makefile: reenable install with NO_CURL
authorMichael J Gruber <git@drmicha.warpmail.net>
Wed, 26 May 2010 14:24:34 +0000 (16:24 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 May 2010 23:46:09 +0000 (16:46 -0700)
Setting NO_CURL leaves some variables like REMOTE_CURL_ALIASES
empty, which creates no fun when for-looping over
$(REMOTE_CURL_ALIASES) unconditionally. Make it conditional.

Reported-by: Paul Walker <PWalker752@aol.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile

index 5b868066060de7e2e892f911bc47d78afe43fc1d..02d6ea39ddb94532f1a8f0413a4e92f1eec6c3d7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1841,12 +1841,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: