diff options
author | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-10-14 21:37:31 +0200 |
---|---|---|
committer | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-10-14 21:37:31 +0200 |
commit | 1f3ec0784818bcbe0e73ea4743a19060163fd9b3 (patch) | |
tree | d3169957cefeee233dccd580fd5bcbbd9c815838 | |
parent | b2026bcc16c1118c201dd5d644a0915a84d0f5e3 (diff) |
Fix `make install` on both BSD and Linux.
Closes #581.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | ffi/Makefile | 2 | ||||
-rw-r--r-- | ffi/lang/python/Makefile | 2 | ||||
-rw-r--r-- | openpgp-ffi/Makefile | 2 | ||||
-rw-r--r-- | sop/Makefile | 2 | ||||
-rw-r--r-- | sq/Makefile | 2 | ||||
-rw-r--r-- | sqv/Makefile | 2 | ||||
-rw-r--r-- | store/Makefile | 2 |
8 files changed, 8 insertions, 8 deletions
@@ -38,7 +38,7 @@ TAR_FLAGS = --sort=name \ --mode=go=rX,u+rw,a-s \ --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime -ifneq ($(filter Darwin BSD,$(shell uname -s)),"") +ifneq ($(filter Darwin %BSD,$(shell uname -s)),) INSTALL ?= ginstall else INSTALL ?= install diff --git a/ffi/Makefile b/ffi/Makefile index 130a773d..a5540db3 100644 --- a/ffi/Makefile +++ b/ffi/Makefile @@ -20,7 +20,7 @@ else endif # Tools. -ifneq ($(filter Darwin BSD,$(shell uname -s)),"") +ifneq ($(filter Darwin %BSD,$(shell uname -s)),) INSTALL ?= ginstall else INSTALL ?= install diff --git a/ffi/lang/python/Makefile b/ffi/lang/python/Makefile index 57e1b91b..e786fe35 100644 --- a/ffi/lang/python/Makefile +++ b/ffi/lang/python/Makefile @@ -10,7 +10,7 @@ PYTHON ?= python3 IPYTHON ?= ipython3 PYTEST ?= pytest-3 -ifneq ($(filter Darwin BSD,$(shell uname -s)),"") +ifneq ($(filter Darwin %BSD,$(shell uname -s)),) INSTALL ?= ginstall else INSTALL ?= install diff --git a/openpgp-ffi/Makefile b/openpgp-ffi/Makefile index 8a22a37b..6bb37c3d 100644 --- a/openpgp-ffi/Makefile +++ b/openpgp-ffi/Makefile @@ -20,7 +20,7 @@ else endif # Tools. -ifneq ($(filter Darwin BSD,$(shell uname -s)),"") +ifneq ($(filter Darwin %BSD,$(shell uname -s)),) INSTALL ?= ginstall else INSTALL ?= install diff --git a/sop/Makefile b/sop/Makefile index 84cd75d1..c9827d56 100644 --- a/sop/Makefile +++ b/sop/Makefile @@ -7,7 +7,7 @@ SOP ?= $(CARGO_TARGET_DIR)/debug/sqop # Tools. CARGO ?= cargo -ifneq ($(filter Darwin BSD,$(shell uname -s)),"") +ifneq ($(filter Darwin %BSD,$(shell uname -s)),) INSTALL ?= ginstall else INSTALL ?= install diff --git a/sq/Makefile b/sq/Makefile index 8b7e11c1..74a0c512 100644 --- a/sq/Makefile +++ b/sq/Makefile @@ -7,7 +7,7 @@ SQ ?= $(CARGO_TARGET_DIR)/debug/sq # Tools. CARGO ?= cargo -ifneq ($(filter Darwin BSD,$(shell uname -s)),"") +ifneq ($(filter Darwin %BSD,$(shell uname -s)),) INSTALL ?= ginstall else INSTALL ?= install diff --git a/sqv/Makefile b/sqv/Makefile index d23c97bc..08aab1de 100644 --- a/sqv/Makefile +++ b/sqv/Makefile @@ -7,7 +7,7 @@ SQV ?= $(CARGO_TARGET_DIR)/debug/sqv # Tools. CARGO ?= cargo -ifneq ($(filter Darwin BSD,$(shell uname -s)),"") +ifneq ($(filter Darwin %BSD,$(shell uname -s)),) INSTALL ?= ginstall else INSTALL ?= install diff --git a/store/Makefile b/store/Makefile index 99d7de43..f78966d6 100644 --- a/store/Makefile +++ b/store/Makefile @@ -6,7 +6,7 @@ CARGO_TARGET_DIR := $(abspath $(CARGO_TARGET_DIR)) # Tools. CARGO ?= cargo -ifneq ($(filter Darwin BSD,$(shell uname -s)),"") +ifneq ($(filter Darwin %BSD,$(shell uname -s)),) INSTALL ?= ginstall else INSTALL ?= install |