[checkmk-commits] Added debug to config.status target and fixed cmk/ livestatus package build target

Module: check_mk Branch: master Commit: a80e27be189b0159382d14c0f9ef86887960bcb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a80e27be189b01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 11:12:36 2017 +0200 Added debug to config.status target and fixed cmk/livestatus package build target Change-Id: Ib8f30d6c4249736829e5fab0a6ea44b84c421997 --- Makefile | 1 + omd/packages/check_mk/Makefile | 4 ++-- omd/packages/mk-livestatus/Makefile | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 737bd36..d319c35 100644 --- a/Makefile +++ b/Makefile @@ -410,6 +410,7 @@ ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac autoreconf --install --include=m4 config.status: $(DIST_DEPS) + @echo "Build $@ (newer targets: $?)" @if test -f config.status; then \ echo "update config.status by reconfiguring in the same conditions" ; \ ./config.status --recheck; \ diff --git a/omd/packages/check_mk/Makefile b/omd/packages/check_mk/Makefile index 903fc83..b245aed 100644 --- a/omd/packages/check_mk/Makefile +++ b/omd/packages/check_mk/Makefile @@ -7,8 +7,8 @@ DISTNAME = $(NAME)-$(CMK_VERSION) .PHONY: skel build: clean - if [ ! -f ../../../$(DISTNAME).tar.gz ]; then - $(MAKE) -C ../../.. $(DISTNAME).tar.gz + if [ ! -f ../../../$(DISTNAME).tar.gz ]; then \ + $(MAKE) -C ../../.. $(DISTNAME).tar.gz ; \ fi tar xzf $(REPO_PATH)/$(DISTNAME).tar.gz cd $(DISTNAME) ; \ diff --git a/omd/packages/mk-livestatus/Makefile b/omd/packages/mk-livestatus/Makefile index da750c3..23a77ad 100644 --- a/omd/packages/mk-livestatus/Makefile +++ b/omd/packages/mk-livestatus/Makefile @@ -6,7 +6,9 @@ CXX_FLAGS := -g -O3 -Wall -Wextra # Attention: copy-n-paste from check_mk/Makefile below... build: clean - $(MAKE) -C ../../.. $(DIR).tar.gz + if [ ! -f ../../../$(DIR).tar.gz ]; then \ + $(MAKE) -C ../../.. $(DIR).tar.gz ; \ + fi tar xzf ../../../$(DIR).tar.gz @if test -d ../boost/local ; then \ BOOST_OPT="--with-boost=$(abspath ../boost/local)" ; \