Makefile: rm RELEASE_DIR and SHELL

RELEASE_DIR is only used once, so it doesn't make sense to have it.

SHELL was introduced in commit 54390f89a7 and was used
implicitly (since Makefile contained some bash-specific code),
but is no longer needed since commit ed68ee1e10.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2020-04-27 14:10:51 -07:00
parent 731947d5ec
commit 772d090930
1 changed files with 1 additions and 5 deletions

View File

@ -23,10 +23,6 @@ GO_BUILD := $(GO) build $(MOD_VENDOR) -buildmode=pie $(EXTRA_FLAGS) -tags "$(BUI
GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build $(MOD_VENDOR) $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \ GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build $(MOD_VENDOR) $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
-ldflags "-w -extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)" -ldflags "-w -extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
RELEASE_DIR := $(CURDIR)/release
SHELL := $(shell command -v bash 2>/dev/null)
.DEFAULT: runc .DEFAULT: runc
runc: runc:
@ -113,7 +109,7 @@ install-man: man
clean: clean:
rm -f runc runc-* rm -f runc runc-*
rm -f contrib/cmd/recvtty/recvtty rm -f contrib/cmd/recvtty/recvtty
rm -rf $(RELEASE_DIR) rm -rf release
rm -rf man/man8 rm -rf man/man8
validate: validate: