From 0bbc8caa38ca6bcc7202d273a389e4af32c7c4ad Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Wed, 14 Oct 2020 10:50:53 +0200 Subject: Make other BSD systems use ginstall too. --- Makefile | 2 +- ffi/Makefile | 2 +- ffi/lang/python/Makefile | 2 +- openpgp-ffi/Makefile | 2 +- sop/Makefile | 2 +- sqv/Makefile | 2 +- store/Makefile | 2 +- tool/Makefile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index edecdedd..c32c490e 100644 --- a/Makefile +++ b/Makefile @@ -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 FreeBSD,$(shell uname -s)),"") +ifneq ($(filter Darwin BSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/ffi/Makefile b/ffi/Makefile index 0812845e..130a773d 100644 --- a/ffi/Makefile +++ b/ffi/Makefile @@ -20,7 +20,7 @@ else endif # Tools. -ifneq ($(filter Darwin FreeBSD,$(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 99d8847d..57e1b91b 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 FreeBSD,$(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 14c14b3d..8a22a37b 100644 --- a/openpgp-ffi/Makefile +++ b/openpgp-ffi/Makefile @@ -20,7 +20,7 @@ else endif # Tools. -ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") +ifneq ($(filter Darwin BSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/sop/Makefile b/sop/Makefile index 372b499a..84cd75d1 100644 --- a/sop/Makefile +++ b/sop/Makefile @@ -7,7 +7,7 @@ SOP ?= $(CARGO_TARGET_DIR)/debug/sqop # Tools. CARGO ?= cargo -ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") +ifneq ($(filter Darwin BSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/sqv/Makefile b/sqv/Makefile index b2369e5d..d23c97bc 100644 --- a/sqv/Makefile +++ b/sqv/Makefile @@ -7,7 +7,7 @@ SQV ?= $(CARGO_TARGET_DIR)/debug/sqv # Tools. CARGO ?= cargo -ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") +ifneq ($(filter Darwin BSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/store/Makefile b/store/Makefile index f73235b1..99d7de43 100644 --- a/store/Makefile +++ b/store/Makefile @@ -6,7 +6,7 @@ CARGO_TARGET_DIR := $(abspath $(CARGO_TARGET_DIR)) # Tools. CARGO ?= cargo -ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") +ifneq ($(filter Darwin BSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install diff --git a/tool/Makefile b/tool/Makefile index 28ea101d..44428c96 100644 --- a/tool/Makefile +++ b/tool/Makefile @@ -7,7 +7,7 @@ SQ ?= $(CARGO_TARGET_DIR)/debug/sq # Tools. CARGO ?= cargo -ifneq ($(filter Darwin FreeBSD,$(shell uname -s)),"") +ifneq ($(filter Darwin BSD,$(shell uname -s)),"") INSTALL ?= ginstall else INSTALL ?= install -- cgit v1.2.3