Skip to content

Commit 046311e

Browse files
committed
Исправление для сборки в Makefile
1 parent 89fe458 commit 046311e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rwildcard = $(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(
66
TARGET_NAME = $(firstword $(MAKECMDGOALS))
77
RUN_ARGS = $(filter-out $@, $(MAKEOVERRIDES) $(MAKECMDGOALS))
88
OS := $(shell uname -s)
9-
TOOLS_DIR ?= .tools
9+
TOOLS_DIR ?= $(PWD)/.tools
1010
SUDO_PASSWORD ?= human
1111

1212
VECTOR_VERSION ?= 0.43.0
@@ -31,10 +31,12 @@ JV_BINARY := $(TOOLS_DIR)/jv_$(JV_VERSION)_$(OS)_amd64
3131

3232
YQ_BINARY_URL := https://github.com/mikefarah/yq/releases/download/v$(YQ_VERSION)/yq_$(OS)_amd64
3333

34+
.PHONY: $(TOOLS_DIR)
35+
$(TOOLS_DIR):
36+
mkdir -p $(TOOLS_DIR)
3437

3538
.PHONY: install-dependencies
36-
install-dependencies: download-vector-bin ## Install required dependencies
37-
mkdir -p $(TOOLS_DIR)
39+
install-dependencies: | $(TOOLS_DIR) download-vector-bin ## Install required dependencies
3840
ifeq (,$(wildcard $(YQ_BINARY)))
3941
wget -qO $(YQ_BINARY) $(YQ_BINARY_URL) --show-progress && chmod +x $(YQ_BINARY)
4042
endif

0 commit comments

Comments
 (0)