Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Remove patch for symlink and force them through makefile opti…
…ons instead." This reverts commit c1077a4.
- Loading branch information
Showing
2 changed files
with
57 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
diff --git a/Makefile b/Makefile | ||
index 0f931a2..db0d69e 100644 | ||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -1705,8 +1705,6 @@ version.sp version.s version.o: EXTRA_CPPFLAGS = \ | ||
|
||
$(BUILT_INS): git$X | ||
$(QUIET_BUILT_IN)$(RM) $@ && \ | ||
- ln git$X $@ 2>/dev/null || \ | ||
- ln -s git$X $@ 2>/dev/null || \ | ||
cp git$X $@ | ||
|
||
common-cmds.h: ./generate-cmdlist.sh command-list.txt | ||
@@ -2026,8 +2024,6 @@ git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB) | ||
|
||
$(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) | ||
$(QUIET_LNCP)$(RM) $@ && \ | ||
- ln $< $@ 2>/dev/null || \ | ||
- ln -s $< $@ 2>/dev/null || \ | ||
cp $< $@ | ||
|
||
$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS) | ||
@@ -2326,30 +2322,23 @@ endif | ||
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ | ||
$(RM) "$$execdir/$$p" && \ | ||
test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ | ||
- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ | ||
cp "$$bindir/$$p" "$$execdir/$$p" || exit; \ | ||
done; \ | ||
} && \ | ||
for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \ | ||
$(RM) "$$bindir/$$p" && \ | ||
test -z "$(NO_INSTALL_HARDLINKS)" && \ | ||
- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ | ||
- ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ | ||
cp "$$bindir/git$X" "$$bindir/$$p" || exit; \ | ||
done && \ | ||
for p in $(BUILT_INS); do \ | ||
$(RM) "$$execdir/$$p" && \ | ||
test -z "$(NO_INSTALL_HARDLINKS)" && \ | ||
- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ | ||
- ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ | ||
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ | ||
done && \ | ||
remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \ | ||
for p in $$remote_curl_aliases; do \ | ||
$(RM) "$$execdir/$$p" && \ | ||
test -z "$(NO_INSTALL_HARDLINKS)" && \ | ||
- 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 && \ | ||
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters