blob: 908459a95ecd38577810a38b6f39f654cd92d4bc [file] [log] [blame]
Andrew Geissler615f2f12022-07-15 14:00:58 -05001From 4125a1ccb82fd53d003acdc34e462f238f0c4f0d Mon Sep 17 00:00:00 2001
2From: Joe Slater <joe.slater@windriver.com>
3Date: Fri, 8 Jul 2022 11:03:22 +0800
4Subject: [PATCH] vim: do not adjust script pathnames
Andrew Geissler82c905d2020-04-13 13:39:40 -05005
6When cross-compiling, we do not want to reference the host versions of
7things like perl and awk.
8
9Upstream-Status: Pending
10
11Signed-off-by: Joe Slater <joe.slater@windriver.com>
Andrew Geissler615f2f12022-07-15 14:00:58 -050012Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13---
14 src/Makefile | 6 +-----
15 1 file changed, 1 insertion(+), 5 deletions(-)
Andrew Geissler82c905d2020-04-13 13:39:40 -050016
Andrew Geissler615f2f12022-07-15 14:00:58 -050017diff --git a/src/Makefile b/src/Makefile
18index c9513a632..7a7cbdc43 100644
19--- a/src/Makefile
20+++ b/src/Makefile
21@@ -2534,11 +2534,7 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
Andrew Geissler82c905d2020-04-13 13:39:40 -050022 rm -rf $$cvs; \
23 fi
24 -chmod $(FILEMOD) $(DEST_TOOLS)/*
25-# replace the path in some tools
Andrew Geissler615f2f12022-07-15 14:00:58 -050026- perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
27- awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
28- awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
29- awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
30+# not replace the path in some tools
Andrew Geissler82c905d2020-04-13 13:39:40 -050031 -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`
32
33 # install the language specific files for tools, if they were unpacked
Andrew Geissler615f2f12022-07-15 14:00:58 -050034--
352.25.1
36