From e181611df97a0b5e670ddd78744bdb9057a42bbd Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 12 Apr 2017 14:29:12 +0000 Subject: [PATCH] projects-dir.mk: Fix missing --prefix argument to projects.py Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 394d924c..137571ee 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -54,6 +54,7 @@ endif MOD_SCRIPT_DIR = ./jw-build/scripts PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pgit.sh /opt/jw-build/bin/pgit.sh) pgit.sh-not-found) BUILD_PY = python $(MOD_SCRIPT_DIR)/build.py -b $(shell pwd) $(BUILD_PY_EXTRA_ARGS) +PROJECTS_PY = python $(MOD_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_ARGS) PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found) RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/jw-build/bin/build-release.sh) release-not-found) PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) @@ -78,14 +79,14 @@ clean-dirs: echo-prereq-build: @make --no-print-directory pull.done >/dev/null 2>&1 - @python $(MOD_SCRIPT_DIR)/projects.py $(PROJECTS_PY_EXTRA_ARGS) required-pkg $(BUILD_PROJECTS) + @$(PROJECTS_PY) required-pkg $(BUILD_PROJECTS) install-prereq-build: make --no-print-directory echo-prereq-build 2>/dev/null | xargs -r $(PKG_MANAGER_SH) install -y echo-prereq-release: @make --no-print-directory pull.done >/dev/null 2>&1 - @python $(MOD_SCRIPT_DIR)/projects.py $(PROJECTS_PY_EXTRA_ARGS) required-pkg --flavour release $(BUILD_PROJECTS) + @$(PROJECTS_PY) required-pkg --flavour release $(BUILD_PROJECTS) doc-project doc-module: $(BROWSER) https://janware.com/wiki/pub/sw:build: