From: Johannes Schindelin Date: Mon, 11 May 2009 11:02:18 +0000 (+0200) Subject: Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile X-Git-Tag: v1.6.3.2~12^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3426e34feddf97085615e619d39f8173ff3f9fb4;p=git.git Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile When the installed programs are tar'ed up and installed on a system where bin/ and libexec/git-core/ live on different file systems, we do not want libexec/git-core/git-* to be hardlinks to bin/git. Noticed by Cedric Staniewski. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 0675c43e7..2b8ce48c0 100644 --- a/Makefile +++ b/Makefile @@ -159,6 +159,9 @@ all:: # Define NO_EXTERNAL_GREP if you don't want "git grep" to ever call # your external grep (e.g., if your system lacks grep, if its grep is # broken, or spawning external process is slower than built-in grep git has). +# +# 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 @@ -1468,6 +1471,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 \