diff options
| author | phryk <phryk@wzff.de> | 2020-08-26 18:47:33 +0200 |
|---|---|---|
| committer | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-10-14 10:53:49 +0200 |
| commit | 69dcd5af55cfdc5bd409f589584fe426d8a2a315 (patch) | |
| tree | 1898b18402f878b5bd13582346c20a2d68a1ab46 | |
| parent | 1e503d7f545c2152adc80ed5d4d92053542fcce0 (diff) | |
Modified conditional to set INSTALL executable to ginstall for FreeBSD.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ffi/Makefile | 2 | ||||
| -rw-r--r-- | ffi/lang/python/Makefile | 3 | ||||
| -rw-r--r-- | openpgp-ffi/Makefile | 2 | ||||
| -rw-r--r-- | sop/Makefile | 3 | ||||
| -rw-r--r-- | sqv/Makefile | 3 | ||||
| -rw-r--r-- | store/Makefile | 3 | ||||
| -rw-r--r-- | tool/Makefile | 3 |
8 files changed, 13 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 -ifeq ($(shell uname -s), Darwin) +ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/ffi/Makefile b/ffi/Makefile index 1feb7b53..0812845e 100644 --- a/ffi/Makefile +++ b/ffi/Makefile @@ -20,7 +20,7 @@ else endif # Tools. -ifeq ($(shell uname -s), Darwin) +ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/ffi/lang/python/Makefile b/ffi/lang/python/Makefile index 429a133e..99d8847d 100644 --- a/ffi/lang/python/Makefile +++ b/ffi/lang/python/Makefile @@ -9,7 +9,8 @@ CFLAGS += -I../../include -I../../../openpgp-ffi/include PYTHON ?= python3 IPYTHON ?= ipython3 PYTEST ?= pytest-3 -ifeq ($(shell uname -s), Darwin) + +ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/openpgp-ffi/Makefile b/openpgp-ffi/Makefile index b6a378fa..14c14b3d 100644 --- a/openpgp-ffi/Makefile +++ b/openpgp-ffi/Makefile @@ -20,7 +20,7 @@ else endif # Tools. -ifeq ($(shell uname -s), Darwin) +ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/sop/Makefile b/sop/Makefile index 5ffb9b45..372b499a 100644 --- a/sop/Makefile +++ b/sop/Makefile @@ -6,7 +6,8 @@ SOP ?= $(CARGO_TARGET_DIR)/debug/sqop # Tools. CARGO ?= cargo -ifeq ($(shell uname -s), Darwin) + +ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/sqv/Makefile b/sqv/Makefile index 7d07b106..b2369e5d 100644 --- a/sqv/Makefile +++ b/sqv/Makefile @@ -6,7 +6,8 @@ SQV ?= $(CARGO_TARGET_DIR)/debug/sqv # Tools. CARGO ?= cargo -ifeq ($(shell uname -s), Darwin) + +ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/store/Makefile b/store/Makefile index 2b907289..f73235b1 100644 --- a/store/Makefile +++ b/store/Makefile @@ -5,7 +5,8 @@ CARGO_TARGET_DIR := $(abspath $(CARGO_TARGET_DIR)) # Tools. CARGO ?= cargo -ifeq ($(shell uname -s), Darwin) + +ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/tool/Makefile b/tool/Makefile index 78177449..28ea101d 100644 --- a/tool/Makefile +++ b/tool/Makefile @@ -6,7 +6,8 @@ SQ ?= $(CARGO_TARGET_DIR)/debug/sq # Tools. CARGO ?= cargo -ifeq ($(shell uname -s), Darwin) + +ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install |