diff options
| -rw-r--r-- | GNUmakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index 71aa2704..7704fcdb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,17 +1,17 @@ # variables that can be changed by users # -VERSION ?= `git describe --long --abbrev=12 --tags --dirty 2>/dev/null || echo 0.15.2` +VERSION ?= $(shell git describe --long --abbrev=12 --tags --dirty 2>/dev/null || echo 0.15.2) PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin SHAREDIR ?= $(PREFIX)/share/aerc LIBEXECDIR ?= $(PREFIX)/libexec/aerc MANDIR ?= $(PREFIX)/share/man GO ?= go -GOFLAGS ?= `contrib/goflags.sh` +GOFLAGS ?= $(shell contrib/goflags.sh) BUILD_OPTS ?= -trimpath GO_LDFLAGS := GO_LDFLAGS += -X main.Version=$(VERSION) -GO_LDFLAGS += -X main.Flags=$$(echo -- $(GOFLAGS) | base64 | tr -d '\r\n') +GO_LDFLAGS += -X main.Flags=$(shell echo -- $(GOFLAGS) | base64 | tr -d '\r\n') GO_LDFLAGS += -X git.sr.ht/~rjarry/aerc/config.shareDir=$(SHAREDIR) GO_LDFLAGS += -X git.sr.ht/~rjarry/aerc/config.libexecDir=$(LIBEXECDIR) GO_LDFLAGS += $(GO_EXTRA_LDFLAGS) |