diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-02-13 02:53:23 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-02-14 06:47:40 (GMT) |
| commit | 7bcf18bfab84374d3305c7a088f95ac1219ddf93 (patch) | |
| tree | 49c67ed5fb9729ef554c3a07a916612af5139e24 /Makefile.in | |
| parent | fbc69323085e2370faeb8b46291cd66cbf9ef649 (diff) | |
Determine whether -E/-r option selects extended regexp
... and then use the right option. See the note in scripts/functions
on where we should use ${foo} and where just 'foo'; this boils down to
whether we can expect the build tools override to be in effect (e.g. in
the actual build scripts) or not (i.e. outside of scripts/build).
While running in scripts/functions, or in scripts/crosstool-NG.sh the
build tools override directory (.build/tools/bin) may have not been
set up (yet, or at all).
Also, modify the installed scripts (populate, xldd) accordingly.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 4e8db5c..c92989a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,6 +62,7 @@ export awk := @AWK@ export grep := @GREP@ export make := @MAKE@ export sed := @SED@ +export sed_r := @SED_R@ export wget := @wget@ export curl := @curl@ export libtool := @LIBTOOL@ @@ -180,7 +181,7 @@ docs/$(PROG_NAME).1.gz: docs/$(PROG_NAME).1 define sed_it @echo " SED '$@'" - @$(sed) -r -e 's,@@CT_BINDIR@@,$(bindir),g;' \ + @$(sed_r) -e 's,@@CT_BINDIR@@,$(bindir),g;' \ -e 's,@@CT_LIBDIR@@,$(libdir),g;' \ -e 's,@@CT_DOCDIR@@,$(docdir),g;' \ -e 's,@@CT_MANDIR@@,$(mandir),g;' \ @@ -214,6 +215,7 @@ paths.mk: FORCE echo 'export grep=$(grep)'; \ echo 'export make=$(make)'; \ echo 'export sed=$(sed)'; \ + echo 'export sed_r=$(sed_r)'; \ echo 'export libtool=$(libtool)'; \ echo 'export libtoolize=$(libtoolize)'; \ echo 'export objcopy=$(objcopy)'; \ @@ -231,6 +233,7 @@ paths.sh: FORCE echo 'export grep="$(grep)"'; \ echo 'export make="$(make)"'; \ echo 'export sed="$(sed)"'; \ + echo 'export sed_r="$(sed_r)"'; \ echo 'export libtool="$(libtool)"'; \ echo 'export libtoolize="$(libtoolize)"'; \ echo 'export objcopy="$(objcopy)"'; \ |