[checkmk-commits] fix install-global dependency

Module: check_mk Branch: master Commit: 27b96dbde07a91f30f10efda11c5136fd91edac8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27b96dbde07a91… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 21 09:24:37 2018 +0100 fix install-global dependency Change-Id: I8068599f73433a8dbdb396537ee6ba4b69704ccc --- omd/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index dd3df58..35be6b5 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -72,6 +72,7 @@ NEW_VERSION_STRING := $(subst /,-,$(NEW_VERSION)) PRE_INSTALL := $(BUILD_HELPER_DIR)/pre-install PRE_SKEL := $(BUILD_HELPER_DIR)/pre-skel +PRE_CMA := $(BUILD_HELPER_DIR)/pre-cma .PHONY: install-global @@ -117,7 +118,7 @@ install: $(addsuffix -install,$(PACKAGES)) chmod -R o+Xr $(DESTDIR)$(OMD_ROOT) -$(PRE_SKEL): install +$(PRE_SKEL): install-global # Install skeleton files (subdirs skel/ in packages' directories) mkdir -p $(DESTDIR)$(OMD_ROOT)/skel @set -e ; cd packages ; for p in $(PACKAGES) ; do \ @@ -178,7 +179,7 @@ clean: $(addsuffix -clean,$(PACKAGES)) # Create installations files that do not lie beyond /omd/versions/$(OMD_VERSION) # and files not owned by a specific package. -install-global: +install-global: install # Create link to default version ln -s $(OMD_VERSION) $(DESTDIR)$(OMD_BASE)/versions/default @@ -319,16 +320,16 @@ setversion: test: t/test_all.sh -cma-pre: check-edition +$(PRE_CMA): check-edition # make the cmc the default core sed -i 's/default)/default) echo "cmc"; exit;/g' packages/omd/CORE.hook # enable the event console by default sed -i 's/default)/default) echo "on"; exit;/g' packages/check_mk/MKEVENTD.hook -cma-install: +cma-install: $(PACKAGES) $(CMA_PRE) make -C packages/cma install -cma: cma-pre $(PACKAGES) cma-install pack +cma: cma-install pack # Create info file to mark minimal cma firmware version requirement @if [ "$(DISTRO_CODE)" = "stretch" ]; then \