From 2f1b669e2f39050cc89dfaac8acbe6bf9bfbe8ca Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Wed, 4 Apr 2018 19:17:15 +0200
Subject: fix 'make -C subdir': use $(CURDIR) instead of $PWD

$(PWD) reflects the dir of 'make' invocation, $(CURDIR) the dir stepped into.
So obtain the current dir from $(CURDIR) instead of $(PWD).

So far, when doing 'make -C osmo-foo-maser', the image's name would be derived
from the root dir's basename and all images were tagged as 'docker-playground'.
With this fix, 'make -C' from anywhere still tags with the proper name.

Change-Id: I1dd0fd1ad89fdee18fdbea851ccc831ad60aeccf
---
 make/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'make/Makefile')

diff --git a/make/Makefile b/make/Makefile
index 14d4c52..21614a8 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -15,7 +15,7 @@
 #
 REGISTRY_HOST=docker.io
 USERNAME=$(USER)
-NAME=$(shell basename $(PWD))
+NAME=$(shell basename $(CURDIR))
 
 RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support
 IMAGE=$(REGISTRY_HOST)/$(USERNAME)/$(NAME)
-- 
cgit v1.2.3