SKIP_DASHED_BUILT_INS: do not skip the bin/ programs
The idea of the `SKIP_DASHED_BUILT_INS` option is to stop hard-linking the built-in commands as separate executables. The patches to do that specifically excluded the three commands `receive-pack`, `upload-archive` and `upload-pack`, though: these commands are expected to be present in the `PATH` in their dashed form on the server side of any fetch/push. However, due to an oversight by myself, even if those commands were still hard-linked, they were not installed into `bin/`. Noticed-by: Michael Forney <mforney@mforney.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
722fc37491
commit
907e6379d0
3
Makefile
3
Makefile
@ -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)"; \
|
|
||||||
then \
|
|
||||||
test -n "$(INSTALL_SYMLINKS)" && \
|
test -n "$(INSTALL_SYMLINKS)" && \
|
||||||
ln -s "git$X" "$$bindir/$$p" || \
|
ln -s "git$X" "$$bindir/$$p" || \
|
||||||
{ test -z "$(NO_INSTALL_HARDLINKS)" && \
|
{ test -z "$(NO_INSTALL_HARDLINKS)" && \
|
||||||
ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
|
ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
|
||||||
ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
|
ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
|
||||||
cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \
|
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" && \
|
||||||
|
Loading…
Reference in New Issue
Block a user