Skip to content

Commit 371276b

Browse files
committed
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0: Makefile: reenable install with NO_CURL
2 parents ff9c082 + 70b89f8 commit 371276b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,12 +1996,13 @@ endif
19961996
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
19971997
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
19981998
done; } && \
1999-
{ for p in $(REMOTE_CURL_ALIASES); do \
1999+
{ test x"$(REMOTE_CURL_ALIASES)" = x || \
2000+
{ for p in $(REMOTE_CURL_ALIASES); do \
20002001
$(RM) "$$execdir/$$p" && \
20012002
ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
20022003
ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
20032004
cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
2004-
done; } && \
2005+
done; } ; } && \
20052006
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
20062007

20072008
install-doc:

0 commit comments

Comments
 (0)