From d66ae50fd51c009941d0c6bd95246502336ebe5a Mon Sep 17 00:00:00 2001 From: dankm Date: Wed, 18 Dec 2019 11:47:11 -0600 Subject: [PATCH] Address minor portability issues (#9414) * Add os specific sed for FreeBSD. * Replace hardcoded "make" with $(MAKE) Some systems don't use GNU make by default, and use something like gnumake or gmake. Respect that when determining the make version. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ef2753062..146abf5d0 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,9 @@ else ifeq ($(UNAME_S),Darwin) SED_INPLACE := sed -i '' endif + ifeq ($(UNAME_S),FreeBSD) + SED_INPLACE := sed -i '' + endif endif GOFILES := $(shell find . -name "*.go" -type f ! -path "./vendor/*" ! -path "*/bindata.go") @@ -24,7 +27,7 @@ GOFMT ?= gofmt -s GOFLAGS := -v EXTRA_GOFLAGS ?= -MAKE_VERSION := $(shell make -v | head -n 1) +MAKE_VERSION := $(shell $(MAKE) -v | head -n 1) ifneq ($(DRONE_TAG),) VERSION ?= $(subst v,,$(DRONE_TAG))