diff options
author | Alexey Neyman <stilor@att.net> | 2017-02-27 22:16:59 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-27 22:16:59 (GMT) |
commit | 1ec5e7aa3400b534264ba1c2fa3949dc6a2cca90 (patch) | |
tree | 67bf8ce9fc7b7558d39a26a0958399a3f0640baa /Makefile.in | |
parent | 85ae00c1a6331d7738abb406a1eb59091c8a4535 (diff) | |
parent | b3c23b7fdb62f396d47f46d8e3908725570d4acd (diff) |
Merge pull request #618 from stilor/revert-sed-require-gnu-sed
Require GNU sed on macos
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/Makefile.in b/Makefile.in index c92989a..f0034cb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,7 +62,6 @@ 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@ @@ -181,7 +180,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;' \ @@ -205,43 +204,18 @@ $(PROG_NAME): ct-ng.in Makefile %: %.in Makefile $(call sed_it) +__paths_vars = install bash awk grep make sed libtool \ + libtoolize objcopy objdump readelf patch gperf + # We create a script fragment that is parseable from inside a Makefile, -# and one from inside a shell script +# and one from inside a shell script. paths.mk: FORCE @echo " GEN '$@'" - @(echo 'export install=$(install)'; \ - echo 'export bash=$(bash)'; \ - echo 'export awk=$(awk)'; \ - 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)'; \ - echo 'export objdump=$(objdump)'; \ - echo 'export readelf=$(readelf)'; \ - echo 'export patch=$(patch)'; \ - echo 'export gperf=$(gperf)'; \ - ) >$@ + @{ $(foreach w,$(__paths_vars),$(if $($w),echo 'export $w=$(subst ','\'',$($w))';)) :; } >$@ paths.sh: FORCE @echo " GEN '$@'" - @(echo 'export install="$(install)"'; \ - echo 'export bash="$(bash)"'; \ - echo 'export awk="$(awk)"'; \ - 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)"'; \ - echo 'export objdump="$(objdump)"'; \ - echo 'export readelf="$(readelf)"'; \ - echo 'export patch="$(patch)"'; \ - echo 'export gperf="$(gperf)"'; \ - ) >$@ + @{ $(foreach w,$(__paths_vars),$(if $($w),echo 'export $w="$(subst ','\'',$($w))"';)) :; } >$@ config/configure.in: FORCE @echo " GEN '$@'" |