[PATCH] Makefile: reenable install with NO_CURL
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- May 26, 2010, 14:24 UTC
- Message-ID
- <4f12dca01c2e72c5ba38ce5230422b394c1297d9.1274883851.git.git@drmicha.warpmail.net>
- In-Reply-To
- <8E0CE121-DB2F-4017-AB46-282562B072FB@aol.com>
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> --- Against master but suggested for maint. Note that the problem occurs during "make install", not "make".
Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile index 07cab8f..d5d6565 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:
-- 1.7.1.232.g2311e.dirty