[PATCH 6/6] Always provide a fallback when hardlinks fail

From

Andreas Färber <andreas.faerber@web.de>

Date

Aug 17, 2008, 09:00 UTC

Message-ID

<0EFF470D-341A-4619-910A-0F9C663D0B51@web.de>

Signed-off-by: Andreas Faerber <andreas.faerber@web.de>
Acked-by: Ingo Weinhold <ingo_weinhold@gmx.de>
Acked-by: Scott McCreary <scottmc2@gmail.com>
---
In one place cp was already used as fallback, so I went that route.
Personally I would also be okay with symlinks as alternative.

  Makefile |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3daf9ac..7dc4bbd 100644
--- a/Makefile
+++ b/Makefile
@@ -1106,7 +1106,7 @@ help.o: help.c common-cmds.h GIT-CFLAGS
  		'-DGIT_INFO_PATH="$(infodir_SQ)"' $<

  $(BUILT_INS): git$X
-	$(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@
+	$(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@ 2>/dev/null || cp git$X $@

  common-cmds.h: ./generate-cmdlist.sh command-list.txt

@@ -1373,10 +1373,10 @@ endif
  	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
  	if test "z$$bindir" != "z$$execdir"; \
  	then \
-		ln -f "$$bindir/git$X" "$$execdir/git$X" || \
+		ln -f "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
  		cp "$$bindir/git$X" "$$execdir/git$X"; \
  	fi && \
-	{ $(foreach p,$(BUILT_INS), $(RM) "$$execdir/$p" && ln "$$execdir/git 
$X" "$$execdir/$p" ;) } && \
+	{ $(foreach p,$(BUILT_INS), $(RM) "$$execdir/$p" && ln "$$execdir/git 
$X" "$$execdir/$p" 2>/dev/null || cp "$$execdir/git$X" "$$execdir/ 
$p" ;) } && \
  	if test "z$$bindir" != "z$$execdir"; \
  	then \
  		$(RM) "$$execdir/git$X"; \

-- 
1.6.0.rc3.32.g8aaa