From d75d38f2266ac5ed8f2e2d92a49e4b1060e4afd8 Mon Sep 17 00:00:00 2001 From: Thomas Hobson Date: Sat, 27 Feb 2021 20:26:58 +1300 Subject: [PATCH] pkg(Makefile): Always call with VERSION set --- packages/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index a3a5513..91124e2 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -2,7 +2,7 @@ # Variables PKG_FILES=$(filter-out common.mk,$(wildcard *.mk)) -PKG_SLUGS=$(foreach pkg, ${PKG_FILES}, $(addprefix $(shell make -f ${pkg} name)-, $(shell make -f ${pkg} versions))) +PKG_SLUGS=$(foreach pkg, ${PKG_FILES}, $(addprefix $(shell make -f ${pkg} name VERSION=UNKNOWN)-, $(shell make -f ${pkg} versions VERSION=UNKNOWN))) # Functions define pkg_info @@ -14,7 +14,7 @@ endef # Targets -build: $(foreach pkg, ${PKG_FILES}, $(addprefix build-$(shell make -f ${pkg} name)-, $(lastword $(shell make -f ${pkg} versions)))) +build: $(foreach pkg, ${PKG_FILES}, $(addprefix build-$(shell make -f ${pkg} name VERSION=UNKNOWN)-, $(lastword $(shell make -f ${pkg} versions VERSION=UNKNOWN)))) $(addprefix build-, ${PKG_SLUGS}): $(call pkg_info,build,$@) @@ -22,7 +22,7 @@ $(addprefix build-, ${PKG_SLUGS}): -clean: $(foreach pkg, ${PKG_FILES}, $(addprefix clean-$(shell make -f ${pkg} name)-, $(shell make -f ${pkg} versions))) +clean: $(foreach pkg, ${PKG_FILES}, $(addprefix clean-$(shell make -f ${pkg} name VERSION=UNKNOWN)-, $(shell make -f ${pkg} versions VERSION=UNKNOWN))) rm -rf build/ $(addprefix clean-, ${PKG_SLUGS}): $(call pkg_info,clean,$@)