mirror of
https://github.com/facebook/zstd.git
synced 2025-12-09 00:03:18 -05:00
Replace -E option with equivalent -r for older versions of sed
This commit is contained in:
parent
7afd5d85d3
commit
b0ed66ef92
10
lib/Makefile
10
lib/Makefile
@ -269,13 +269,13 @@ LIBDIR ?= $(libdir)
|
|||||||
includedir ?= $(PREFIX)/include
|
includedir ?= $(PREFIX)/include
|
||||||
INCLUDEDIR ?= $(includedir)
|
INCLUDEDIR ?= $(includedir)
|
||||||
|
|
||||||
PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -E -e "s@^$(EXEC_PREFIX)(/|$$)@@p")
|
PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -r -e "s@^$(EXEC_PREFIX)(/|$$)@@p")
|
||||||
PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -E -e "s@^$(PREFIX)(/|$$)@@p")
|
PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -r -e "s@^$(PREFIX)(/|$$)@@p")
|
||||||
|
|
||||||
ifeq (,$(PCLIBDIR))
|
ifeq (,$(PCLIBDIR))
|
||||||
# Additional prefix check is required, since the empty string is technically a
|
# Additional prefix check is required, since the empty string is technically a
|
||||||
# valid PCLIBDIR
|
# 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)
|
$(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -283,7 +283,7 @@ endif
|
|||||||
ifeq (,$(PCINCDIR))
|
ifeq (,$(PCINCDIR))
|
||||||
# Additional prefix check is required, since the empty string is technically a
|
# Additional prefix check is required, since the empty string is technically a
|
||||||
# valid PCINCDIR
|
# 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)
|
$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -307,7 +307,7 @@ INSTALL_DATA ?= $(INSTALL) -m 644
|
|||||||
libzstd.pc:
|
libzstd.pc:
|
||||||
libzstd.pc: libzstd.pc.in
|
libzstd.pc: libzstd.pc.in
|
||||||
@echo creating pkgconfig
|
@echo creating pkgconfig
|
||||||
$(Q)@sed -E -e 's|@PREFIX@|$(PREFIX)|' \
|
$(Q)@sed -r -e 's|@PREFIX@|$(PREFIX)|' \
|
||||||
-e 's|@LIBDIR@|$(PCLIBDIR)|' \
|
-e 's|@LIBDIR@|$(PCLIBDIR)|' \
|
||||||
-e 's|@INCLUDEDIR@|$(PCINCDIR)|' \
|
-e 's|@INCLUDEDIR@|$(PCINCDIR)|' \
|
||||||
-e 's|@VERSION@|$(VERSION)|' \
|
-e 's|@VERSION@|$(VERSION)|' \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user