From: dkcasset Date: Fri, 26 Jun 2020 17:43:28 +0000 (-0700) Subject: Replace -E option with equivalent -r for older versions of sed X-Git-Tag: v1.4.7~128^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0ed66ef923fba27f5da5281a74851334bf5ef61;p=thirdparty%2Fzstd.git Replace -E option with equivalent -r for older versions of sed --- diff --git a/lib/Makefile b/lib/Makefile index c4305d6f8..551d3de5b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -269,13 +269,13 @@ LIBDIR ?= $(libdir) includedir ?= $(PREFIX)/include INCLUDEDIR ?= $(includedir) -PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -E -e "s@^$(EXEC_PREFIX)(/|$$)@@p") -PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -E -e "s@^$(PREFIX)(/|$$)@@p") +PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -r -e "s@^$(EXEC_PREFIX)(/|$$)@@p") +PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -r -e "s@^$(PREFIX)(/|$$)@@p") ifeq (,$(PCLIBDIR)) # Additional prefix check is required, since the empty string is technically a # valid PCLIBDIR -ifeq (,$(shell echo "$(LIBDIR)" | sed -n -E -e "\\@^$(EXEC_PREFIX)(/|$$)@ p")) +ifeq (,$(shell echo "$(LIBDIR)" | sed -n -r -e "\\@^$(EXEC_PREFIX)(/|$$)@ p")) $(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file) endif endif @@ -283,7 +283,7 @@ endif ifeq (,$(PCINCDIR)) # Additional prefix check is required, since the empty string is technically a # valid PCINCDIR -ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -E -e "\\@^$(PREFIX)(/|$$)@ p")) +ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -r -e "\\@^$(PREFIX)(/|$$)@ p")) $(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file) endif endif @@ -307,7 +307,7 @@ INSTALL_DATA ?= $(INSTALL) -m 644 libzstd.pc: libzstd.pc: libzstd.pc.in @echo creating pkgconfig - $(Q)@sed -E -e 's|@PREFIX@|$(PREFIX)|' \ + $(Q)@sed -r -e 's|@PREFIX@|$(PREFIX)|' \ -e 's|@LIBDIR@|$(PCLIBDIR)|' \ -e 's|@INCLUDEDIR@|$(PCINCDIR)|' \ -e 's|@VERSION@|$(VERSION)|' \