[checkmk-commits] Simplified path detection logic a tiny bit.

Module: check_mk Branch: master Commit: a0e104015c4677af537f2db897367a1a01347b15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0e104015c4677… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 10:59:23 2018 +0100 Simplified path detection logic a tiny bit. Change-Id: Ib40d0028756ce702804ea091ced8b150aac8cf5b --- omd/Makefile.omd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 0a44778..8d3c43c 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -1,8 +1,5 @@ # General settings included by all packages -PERL := /usr/bin/perl -P5TMPDIST := $(shell pwd)/../perl-modules/dist - # Makefile is loaded either from omd/packages/*/Makefile or omd/Makefile ifneq (,$(wildcard ../../../omd/distro)) REPO_PATH := $(abspath ../../..) @@ -45,6 +42,8 @@ include $(REPO_PATH)/omd/distros/$(DISTRO_NAME)_$(DISTRO_VERSION).mk # Net result -> all Makefiles have now access to the linux distribution # specific settings +PERL := /usr/bin/perl +P5TMPDIST := $(REPO_PATH)/omd/packages/perl-modules/dist TMP_PYTHON_PATH := $(REPO_PATH)/omd/packages/python/tmp.python27 PYTHON_LIB := $(TMP_PYTHON_PATH)/lib/python2.7