aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-23 01:43:08 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-23 01:43:08 -0700
commit2c8f8b19d4f293edd78885880ed1a6166395ffdd (patch)
treec61979dbec0499dfa8e1f9936e2a5001d6fac8f1
parentbbc0995792880d9f87f5c1a871f5f55b7284c7f1 (diff)
parent3426e34feddf97085615e619d39f8173ff3f9fb4 (diff)
downloadgit-2c8f8b19d4f293edd78885880ed1a6166395ffdd.tar.gz
git-2c8f8b19d4f293edd78885880ed1a6166395ffdd.tar.xz
Merge branch 'js/maint-no-ln-across-libexec-and-bin'
* js/maint-no-ln-across-libexec-and-bin: Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile Conflicts: Makefile
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3ef9230f7..fdb39fa43 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -1549,6 +1552,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 \