Module: check_mk Branch: master Commit: 631612e05bc5a9bb474f24f8fa4285ff95345651 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=631612e05bc5a9… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Nov 30 15:09:40 2018 +0100 fix build targets Change-Id: I192214171573c10e9751d889337249bfc0711209 --- omd/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index 9cba363..1f9f0b6 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -110,24 +110,20 @@ PRE_SKEL := $(BUILD_HELPER_DIR)/pre-skel INSTALL := $(BUILD_HELPER_DIR)/install INSTALL_GLOBAL := $(BUILD_HELPER_DIR)/install-global -BUILD_TARGETS := $(shell echo $(PACKAGES) | tr 'a-z' 'A-Z' | tr '-' '_' ) -INSTALL_TARGETS := $(foreach package,$(addsuffix _INSTALL,$(BUILD_TARGETS)),$($(package))) -SKEL_TARGETS := $(foreach package,$(addsuffix _SKEL,$(BUILD_TARGETS)),$($(package))) +BUILD_TARGET_VARS := $(shell echo $(PACKAGES) | tr 'a-z' 'A-Z' | tr '-' '_' ) +BUILD_TARGETS := $(foreach package,$(addsuffix _BUILD,$(BUILD_TARGET_VARS)),$($(package))) +INSTALL_TARGETS := $(foreach package,$(addsuffix _INSTALL,$(BUILD_TARGET_VARS)),$($(package))) +SKEL_TARGETS := $(foreach package,$(addsuffix _SKEL,$(BUILD_TARGET_VARS)),$($(package))) .PHONY: install-global build install pack skel -debug: - echo $(BUILD_TARGETS) - echo $(INSTALL_TARGETS) - echo $(SKEL_TARGETS) - build: $(BUILD_TARGETS) install: $(INSTALL) install-global: $(INSTALL_GLOBAL) -pack: $(BIN_TGZ) +pack: $(BIN_TGZ) skel: $(DESTDIR)$(OMD_ROOT)/share/omd/skel.permissions $(FIX_SKEL)