diff --git a/Makefile b/Makefile index 711f9a0..a6eb5ba 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ else endif GOBIN ?= $(shell go env GOPATH)/bin -GOMAKE ?= github.com/tkrop/go-make@v0.0.14 +GOMAKE ?= github.com/tkrop/go-make@v0.0.15 TARGETS := $(shell command -v go-make >/dev/null || \ go install $(GOMAKE) && go-make targets) diff --git a/Makefile.base b/Makefile.base index 8522f3f..8f14469 100644 --- a/Makefile.base +++ b/Makefile.base @@ -448,11 +448,11 @@ install-all:: $(TARGETS_INSTALL_ALL) # install go tools used by the project. $(TARGETS_INSTALL_GO):: install-%: $(GOBIN)/% -$(addprefix $(GOBIN)/,$(COMMANDS_GO)):: $(GOBIN)/%: +$(addprefix $(GOBIN)/,$(COMMANDS_GO)): $(GOBIN)/%: go install $(call go-pkg,install,$(TOOLS_GO),^$*$$); # install go tools providing an install.sh script. $(TARGETS_INSTALL_SH):: install-%: $(GOBIN)/% -$(addprefix $(GOBIN)/,$(COMMANDS_SH)):: $(GOBIN)/%: +$(addprefix $(GOBIN)/,$(COMMANDS_SH)): $(GOBIN)/%: @if ! command -v $*; then \ curl --silent --show-error --fail --location \ https://raw.githubusercontent.com/anchore/$*/main/install.sh | \ @@ -460,7 +460,7 @@ $(addprefix $(GOBIN)/,$(COMMANDS_SH)):: $(GOBIN)/%: fi; # install npm tools used by the project. $(TARGETS_INSTALL_NPM):: install-%: $(NVM_BIN)/% -$(addprefix $(NVM_BIN)/,$(TOOLS_NPM:-cli=)):: $(NVM_BIN)/%: +$(addprefix $(NVM_BIN)/,$(TOOLS_NPM:-cli=)): $(NVM_BIN)/%: @if command -v npm &> /dev/null && ! command -v $*; then \ echo "npm install --global ^$*$$"; \ npm install --global $(filter $*-cli,$(TOOLS_NPM)); \ @@ -468,7 +468,7 @@ $(addprefix $(NVM_BIN)/,$(TOOLS_NPM:-cli=)):: $(NVM_BIN)/%: #@ install software command or service created by the project. $(TARGETS_INSTALL):: install-%: $(GOBIN)/% -$(addprefix $(GOBIN)/,$(COMMANDS)):: $(GOBIN)/%: $(DIR_BUILD)/% +$(addprefix $(GOBIN)/,$(COMMANDS)): $(GOBIN)/%: $(DIR_BUILD)/% cp -f $< $(GOBIN)/$*; #@ uninstall all software created by the project. diff --git a/VERSION b/VERSION index 9789c4c..ceddfb2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.14 +0.0.15