undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/no-builtins-on-disk-option' into maint

Browse Source 
Brown-paper-bag fix.

* js/no-builtins-on-disk-option:
  SKIP_DASHED_BUILT_INS: do not skip the bin/ programs
This commit is contained in:
Junio C Hamano 2020-10-22 15:01:21 -07:00
commit 380ba99077
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -2981,15 +2981,12 @@ endif
} && \ } && \
for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \ for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
$(RM) "$$bindir/$$p" && \ $(RM) "$$bindir/$$p" && \
if test -z "$(SKIP_DASHED_BUILT_INS)"; \ test -n "$(INSTALL_SYMLINKS)" && \
then \ ln -s "git$X" "$$bindir/$$p" || \
test -n "$(INSTALL_SYMLINKS)" && \ { test -z "$(NO_INSTALL_HARDLINKS)" && \
ln -s "git$X" "$$bindir/$$p" || \ ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
{ test -z "$(NO_INSTALL_HARDLINKS)" && \ ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \
ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \
fi \
done && \ done && \
for p in $(BUILT_INS); do \ for p in $(BUILT_INS); do \
$(RM) "$$execdir/$$p" && \ $(RM) "$$execdir/$$p" && \