From 30e0349469e7e7fa6ae8496a7282338691bb8b8c Mon Sep 17 00:00:00 2001 From: Alaudidae Lark Date: Fri, 4 Oct 2019 17:05:44 +0530 Subject: [PATCH] include common.mk relative to MAKE_PATH --- Makefile.docker | 1 + Makefile.python | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.docker b/Makefile.docker index d1dd174..f61f774 100644 --- a/Makefile.docker +++ b/Makefile.docker @@ -1,6 +1,7 @@ # Suitable for dockerfile based services .PHONY: clean clean-test clean-pyc clean-build docs help common.mk .DEFAULT_GOAL := help +MAKE_PATH := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) NET_NAME := docker_net SERVICE := docker_image diff --git a/Makefile.python b/Makefile.python index c64ff69..d9371a9 100644 --- a/Makefile.python +++ b/Makefile.python @@ -1,8 +1,9 @@ # Suitable for python monorepo with packages in subdirectories(contains project.mk) .PHONY : _forward Makefile common.mk .DEFAULT_GOAL := help +MAKE_PATH := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include common.mk +include ${MAKE_PATH}/common.mk SUBPKGS := $(patsubst %setup.py,%,$(wildcard */setup.py)) $(warning SUBPKGS is $(SUBPKGS))