diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:04:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:04:29 -0700 |
| commit | 2a1feb92ee58770670e6b82992d29cbc5d6f04aa (patch) | |
| tree | 68feda81211ff3b0fc0599d7530f9057261d0a62 | |
| parent | 5e04a1ee33f82051668f09d73cf16348169e7f1f (diff) | |
| parent | 3426e34feddf97085615e619d39f8173ff3f9fb4 (diff) | |
| download | git-2a1feb92ee58770670e6b82992d29cbc5d6f04aa.tar.gz git-2a1feb92ee58770670e6b82992d29cbc5d6f04aa.tar.xz | |
Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maint
* js/maint-no-ln-across-libexec-and-bin:
Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
Conflicts:
Makefile
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -175,6 +175,9 @@ all:: # Define OBJECT_CREATION_USES_RENAMES if your operating systems has problems # when hardlinking a file to another name and unlinking the original file right # away (some NTFS drivers seem to zero the contents in that scenario). +# +# Define NO_CROSS_DIRECTORY_HARDLINKS if you plan to distribute the installed +# programs as a tar, where bin/ and libexec/ might be on different file systems. GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE @$(SHELL_PATH) ./GIT-VERSION-GEN @@ -1550,6 +1553,7 @@ endif bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ { $(RM) "$$execdir/git-add$X" && \ + test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \ cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \ { for p in $(filter-out git-add$X,$(BUILT_INS)); do \ |