Browse Source

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.
lunny/display_deleted_branch2
dankm 3 years ago
committed by techknowlogick
parent
commit
d66ae50fd5
  1. 5
      Makefile

5
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))

Loading…
Cancel
Save