[checkmk-commits] CMK-1468: better readability of Makefiles

Module: check_mk Branch: master Commit: 009674a11e558146a76fba4304d47ee09718a09d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=009674a11e5581… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Jan 14 14:44:44 2019 +0100 CMK-1468: better readability of Makefiles Change-Id: I77e050e20a9315239e6eb6ea9d89c996ffb1aa79 --- omd/Makefile | 5 +---- omd/packages/Python/Python.make | 11 ++++------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index 5db396c..c38f102 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -349,10 +349,7 @@ $(CMA_PACKAGE): $(CMA-INSTALL) $(DESTDIR)$(OMD_ROOT)/share/omd/skel.permissions $(OMD_VERSION) clean: $(addsuffix -clean,$(PACKAGES)) - @if [ -d $(DESTDIR) ]; then \ - rm -rf $(DESTDIR) ; \ - fi - env + rm -rf $(DESTDIR) @for p in packages/* ; do \ if [ -d $$p ] && [ -f $$p/Makefile ]; then \ $(MAKE) -C $$p clean ; \ diff --git a/omd/packages/Python/Python.make b/omd/packages/Python/Python.make index bbd1e2e..13ec6d0 100644 --- a/omd/packages/Python/Python.make +++ b/omd/packages/Python/Python.make @@ -3,13 +3,10 @@ PYTHON := Python PYTHON_VERS := 2.7.15 PYTHON_DIR := $(PYTHON)-$(PYTHON_VERS) -PYTHON_BUILD = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-build - -PYTHON_COMPILE = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-compile - -PYTHON_INSTALL = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install - -PYTHON_PATCHING = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-patching +PYTHON_BUILD := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-build +PYTHON_COMPILE := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-compile +PYTHON_INSTALL := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install +PYTHON_PATCHING := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-patching .PHONY: Python Python-install Python-skel Python-clean upstream