From 1614db2e78ea3a09e89fb6e2b7604c3baf8975c0 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 18 Mar 2018 18:28:29 +0000 Subject: [PATCH] Merge branch 'cboltz-fix-make-C-profiles' into 'master' Fix $(PWD) when using "make -C profiles" See merge request apparmor/apparmor!80 Acked-by: John Johansen (cherry picked from commit 14096cb3a71e2a9343ad8dd2dc3fefbe54a1faac) 20893382 Fix $(PWD) when using "make -C profiles" --- profiles/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/profiles/Makefile b/profiles/Makefile index dc005eafd..7ad4ef41d 100644 --- a/profiles/Makefile +++ b/profiles/Makefile @@ -40,6 +40,9 @@ EXTRAS_SOURCE=./apparmor/profiles/extras/ SUBDIRS=$(shell find ${PROFILES_SOURCE} -type d -print) TOPLEVEL_PROFILES=$(filter-out ${SUBDIRS}, $(wildcard ${PROFILES_SOURCE}/*)) +# $(PWD) is wrong when using "make -C profiles" - explicitely set it here to get the right value +PWD=$(shell pwd) + local: for profile in ${TOPLEVEL_PROFILES}; do \ fn=$$(basename $$profile); \