diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-04-04 19:17:15 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-04-05 03:15:23 +0200 |
| commit | 2f1b669e2f39050cc89dfaac8acbe6bf9bfbe8ca (patch) | |
| tree | 9f1f2661c68c760e4498cff5e392fe61d211f082 /make/Makefile | |
| parent | 1b51ff89c57ec2cec69b922cf4968e6909bf345a (diff) | |
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
Diffstat (limited to 'make/Makefile')
| -rw-r--r-- | make/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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) |