diff options
| author | dankm <dan.mcgregor@usask.ca> | 2019-12-18 11:47:11 -0600 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-12-18 12:47:11 -0500 |
| commit | d66ae50fd51c009941d0c6bd95246502336ebe5a (patch) | |
| tree | 226577b891f5f981ef40513c67d6b4590924c8db | |
| parent | 1b8a9197b39b7f9f0bf4c9335a1321c35ad19abe (diff) | |
| download | gitea-d66ae50fd51c009941d0c6bd95246502336ebe5a.tar.gz gitea-d66ae50fd51c009941d0c6bd95246502336ebe5a.zip | |
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.
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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)) |