[checkmk-commits] Fixed wrong repo path after yesterdays makefile changes

Module: check_mk Branch: master Commit: 7f0240f8e98c5f08eb822e3be3ae5f90df646f34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f0240f8e98c5f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 12 08:30:15 2018 +0200 Fixed wrong repo path after yesterdays makefile changes Change-Id: I3543da9a8d15fcc00c01b159d73140ebf087d32a --- defines.make | 2 ++ omd/Makefile.omd | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/defines.make b/defines.make index da0b190..8520fd9 100644 --- a/defines.make +++ b/defines.make @@ -23,6 +23,8 @@ # Boston, MA 02110-1301 USA. # +REPO_PATH := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) + EDITION := raw EDITION_SHORT := cre diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 570af7f..9d1564a 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -1,11 +1,6 @@ # General settings included by all packages -# Makefile is loaded either from omd/packages/*/Makefile or omd/Makefile -ifneq (,$(wildcard ../../../omd/distro)) - REPO_PATH := $(abspath ../../..) -else - REPO_PATH := $(abspath ..) -endif +REPO_PATH := $(realpath $(dir $(realpath $(dir $(lastword $(MAKEFILE_LIST)))))) include $(REPO_PATH)/defines.make