[checkmk-commits] CMK-1918: dynamic rrdtool version in toplevel Make

Module: check_mk Branch: master Commit: 1a36ec7c00ba358e478d90dcce8c2efe393ba881 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a36ec7c00ba35… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Apr 10 15:09:02 2019 +0200 CMK-1918: dynamic rrdtool version in toplevel Make Change-Id: Ic8c1596cdd0fe7afbca618efdfe1cd8d8172524f --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5944705..800e851 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ JAVASCRIPT_SOURCES := $(filter-out %_min.js,$(wildcard $(addsuffix /web/htdocs/j PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs/images/icons enterprise/web/htdocs/images enterprise/web/htdocs/images/icons managed/web/htdocs/images managed/web/htdocs/images/icons)) +RRDTOOL_VERS := $(shell egrep -h "RRDTOOL_VERS\s:=\s" omd/packages/rrdtool/rrdtool.make | sed 's/RRDTOOL_VERS\s:=\s//') .PHONY: all analyze build check check-binaries check-permissions check-version \ clean compile-neb-cmc cppcheck dist documentation format format-c \ @@ -404,8 +405,8 @@ config.status: $(CONFIG_DEPS) else \ BOOST_OPT="DUMMY1=" ; \ fi ; \ - if test -d "omd/rrdtool-1.7.1/src/.libs"; then \ - RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-1.7.1/src/.libs)" ; \ + if test -d "omd/rrdtool-$(RRDTOOL_VERS)/src/.libs"; then \ + RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-$(RRDTOOL_VERS)/src/.libs)" ; \ else \ RRD_OPT="DUMMY2=" ; \ fi ; \