From e72638bdc7a927741076b92e086baa6506ed5490 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 25 Oct 2017 19:34:18 +0200 Subject: [PATCH] Makefile: Use CURDIR instead of PWD Fixes setup of BASE_DIR git repositories when used like: make -C system-images update Related: SYS#3967 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4b7c37a..2b4370f 100644 --- a/Makefile +++ b/Makefile @@ -112,10 +112,10 @@ build.%: | git/poky # Append entries to conf/local.conf. Common first, machine second... filter $(Q)$(foreach file,$(CFG_FILES), \ - cat $(file) | sed s,BASE_DIR,$(PWD), >> $@/conf/local.conf;) + cat $(file) | sed s,BASE_DIR,${CURDIR}, >> $@/conf/local.conf;) @echo "require conf/distro/include/sysmocom-defaults.conf" >> $@/conf/local.conf - $(Q)cat cfg/bblayers.conf | sed s,BASE_DIR,$(PWD), > $@/conf/bblayers.conf + $(Q)cat cfg/bblayers.conf | sed s,BASE_DIR,${CURDIR}, > $@/conf/bblayers.conf # generic git pull --rebase rule. Let's assume this is matching poky-update