Makefile: realpath engine-, cli-dir

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker · Aug 14, 2019 · 2929c9b · 2929c9b
1 parent fe23576
commit 2929c9b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 include common.mk
 
-CLI_DIR:=$(CURDIR)/../cli
-ENGINE_DIR:=$(CURDIR)/../engine
+CLI_DIR:=$(realpath $(CURDIR)/../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../engine)
 STATIC_VERSION:=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 
 # Taken from: https://www.cmcrossroads.com/article/printing-value-makefile-variable

diff --git a/deb/Makefile b/deb/Makefile
@@ -1,7 +1,7 @@
 include ../common.mk
 
-CLI_DIR:=$(CURDIR)/../../cli
-ENGINE_DIR:=$(CURDIR)/../../engine
+CLI_DIR:=$(realpath $(CURDIR)/../../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
 GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang

diff --git a/image/Makefile b/image/Makefile
@@ -1,7 +1,7 @@
 include ../common.mk
 
-ENGINE_DIR:=$(CURDIR)/../../engine
-CLI_DIR:=$(CURDIR)/../../cli
+CLI_DIR:=$(realpath $(CURDIR)/../../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
 GO_BASE_IMAGE=golang
 ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)-stretch
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))

diff --git a/rpm/Makefile b/rpm/Makefile
@@ -1,7 +1,7 @@
 include ../common.mk
 
-ENGINE_DIR:=$(CURDIR)/../../engine
-CLI_DIR:=$(CURDIR)/../../cli
+CLI_DIR:=$(realpath $(CURDIR)/../../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
 GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
 STATIC_VERSION:=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
 GO_BASE_IMAGE=golang

diff --git a/static/Makefile b/static/Makefile
@@ -1,8 +1,7 @@
 include ../common.mk
 
-SHELL:=/bin/bash
-ENGINE_DIR:=$(CURDIR)/../../engine
-CLI_DIR:=$(CURDIR)/../../cli
+CLI_DIR:=$(realpath $(CURDIR)/../../cli)
+ENGINE_DIR:=$(realpath $(CURDIR)/../../engine)
 STATIC_VERSION:=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION))
 CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files