diff --git a/Rules.mk b/Rules.mk index 099a970e6d0..ffc62fce1ac 100644 --- a/Rules.mk +++ b/Rules.mk @@ -99,8 +99,7 @@ nofuse: GOTAGS += nofuse nofuse: build .PHONY: nofuse -install: $$(DEPS_GO) - go install $(go-flags-with-tags) ./cmd/ipfs +install: cmd/ipfs-install .PHONY: install install_unsupported: diff --git a/cmd/ipfs/Rules.mk b/cmd/ipfs/Rules.mk index 38cc676c538..60b5fa6fb05 100644 --- a/cmd/ipfs/Rules.mk +++ b/cmd/ipfs/Rules.mk @@ -12,12 +12,20 @@ PATH := $(realpath $(d)):$(PATH) # DEPS_OO_$(d) += merkledag/pb/merkledag.pb.go namesys/pb/namesys.pb.go # DEPS_OO_$(d) += pin/internal/pb/header.pb.go unixfs/pb/unixfs.pb.go -$(IPFS_BIN_$(d)): GOFLAGS += -ldflags="-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(shell git rev-parse --short HEAD)" +$(d)_flags =-ldflags="-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(shell git rev-parse --short HEAD)" + +$(IPFS_BIN_$(d)): GOFLAGS += $(cmd/ipfs_flags) # uses second expansion to collect all $(DEPS_GO) $(IPFS_BIN_$(d)): $(d) $$(DEPS_GO) ALWAYS #| $(DEPS_OO_$(d)) $(go-build) + +$(d)-install: GOFLAGS += $(cmd/ipfs_flags) +$(d)-install: + go install $(go-flags-with-tags) ./cmd/ipfs +.PHONY: $(d)-install + COVER_BIN_$(d) := $(d)/ipfs-test-cover CLEAN += $(COVER_BIN_$(d))