37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
fix MakeMaker issues with using wrong SHELL/GREP
|
|
|
|
A set of substitution is being processed to all target scripts with sed by
|
|
replacing some key words with the detected values at configure time, this
|
|
is exactly not compliant with cross compling, and will cause missing path
|
|
errors at run time like:
|
|
"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory"
|
|
|
|
Fixed by removing unneeded substitution and using real runtime paths
|
|
instead.
|
|
|
|
Signed-off-by: Ming Liu <ming.liu@windriver.com>
|
|
|
|
Upstream-Status: Pending
|
|
|
|
---
|
|
Makefile.am | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 4f51b61..80a5ddf 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -93,8 +93,7 @@ SUFFIXES = .in
|
|
.in:
|
|
$(AM_V_GEN)rm -f $@-t $@ \
|
|
&& sed \
|
|
- -e 's|/bin/sh|$(SHELL)|g' \
|
|
- -e 's|[@]GREP@|$(GREP)|g' \
|
|
+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \
|
|
-e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \
|
|
-e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \
|
|
-e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \
|
|
--
|
|
2.7.4
|
|
|