зеркало из https://github.com/microsoft/git.git
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0: Makefile: reenable install with NO_CURL
This commit is contained in:
Коммит
371276bf29
3
Makefile
3
Makefile
|
@ -1996,12 +1996,13 @@ endif
|
||||||
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
|
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
|
||||||
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
|
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
|
||||||
done; } && \
|
done; } && \
|
||||||
|
{ test x"$(REMOTE_CURL_ALIASES)" = x || \
|
||||||
{ for p in $(REMOTE_CURL_ALIASES); do \
|
{ for p in $(REMOTE_CURL_ALIASES); do \
|
||||||
$(RM) "$$execdir/$$p" && \
|
$(RM) "$$execdir/$$p" && \
|
||||||
ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
|
ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
|
||||||
ln -s "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; \
|
cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
|
||||||
done; } && \
|
done; } ; } && \
|
||||||
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
|
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
|
||||||
|
|
||||||
install-doc:
|
install-doc:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче