1vim: do not adjust script pathnames 2 3When cross-compiling, we do not want to reference the host versions of 4things like perl and awk. 5 6Upstream-Status: Pending 7 8Signed-off-by: Joe Slater <joe.slater@windriver.com> 9 10Index: git/src/Makefile 11=================================================================== 12--- git.orig/src/Makefile 13+++ git/src/Makefile 14@@ -2565,11 +2565,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ 15 rm -rf $$cvs; \ 16 fi 17 -chmod $(FILEMOD) $(DEST_TOOLS)/* 18-# replace the path in some tools 19+ 20+# replace the path in some tools, but not when cross-compiling 21+ifneq ($(CROSS_COMPILING),1) 22 perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl 23 awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ 24 awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \ 25 awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi 26+endif 27 -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*` 28 29 # install the language specific files for tools, if they were unpacked 30