| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | fix MakeMaker issues with using wrong SHELL/GREP |
| 2 | |
| 3 | A set of substitution is being processed to all target scripts with sed by |
| 4 | replacing some key words with the detected values at configure time, this |
| 5 | is exactly not compliant with cross compling, and will cause missing path |
| 6 | errors at run time like: |
| 7 | "/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" |
| 8 | |
| 9 | Fixed by removing unneeded substitution and using real runtime paths |
| 10 | instead. |
| 11 | |
| 12 | Signed-off-by: Ming Liu <ming.liu@windriver.com> |
| 13 | |
| 14 | Upstream-Status: Pending |
| 15 | |
| 16 | --- |
| 17 | Makefile.am | 3 +-- |
| 18 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/Makefile.am b/Makefile.am |
| 21 | index d4ecc3f..e4657d2 100644 |
| 22 | --- a/Makefile.am |
| 23 | +++ b/Makefile.am |
| 24 | @@ -82,8 +82,7 @@ SUFFIXES = .in |
| 25 | .in: |
| 26 | $(AM_V_GEN)rm -f $@-t $@ \ |
| 27 | && sed \ |
| 28 | - -e 's|/bin/sh|$(SHELL)|g' \ |
| 29 | - -e 's|[@]GREP@|$(GREP)|g' \ |
| 30 | + -e 's|[@]GREP@|$(base_bindir)/grep|g' \ |
| 31 | -e 's|[@]VERSION@|$(VERSION)|g' \ |
| 32 | $(srcdir)/$@.in >$@-t \ |
| 33 | && chmod a=rx $@-t \ |
| 34 | -- |
| 35 | 2.7.4 |
| 36 | |