Skip to content
Permalink
Browse files

Move definition of PKG_VERSION to defines.make

PKG_VERSION is only used in omd/Makefile, but it's easier to fing it in the defines
$(basename ) is incorrect, as the last suffix might be .demo, but the short code of the editon needs to be removed

Change-Id: I06846102a2c991b2933af2f8f56d444b85f8e4f3
  • Loading branch information...
AZurhake committed Jun 7, 2019
1 parent c420cd0 commit f0993c0666bafbf422adba0bcad68cfce9ea218e
Showing with 1 addition and 1 deletion.
  1. +1 −0 defines.make
  2. +0 −1 omd/Makefile
@@ -48,6 +48,7 @@ VERSION := 1.7.0i1
# Will be set to ".demo" by cmk build system when building a demo package
DEMO_SUFFIX :=
OMD_VERSION := $(VERSION).$(EDITION_SHORT)$(DEMO_SUFFIX)
PKG_VERSION := $(VERSION)$(DEMO_SUFFIX)

SHELL := /bin/bash
# TODO: Be more strict - Add this:
@@ -101,7 +101,6 @@ SKEL := $(DESTDIR)$(OMD_ROOT)/skel
# filenames and sed arguments should not contain '/'
NEW_VERSION_STRING := $(subst /,-,$(NEW_VERSION))
CMA_PKG_VERSION_TXT := $(shell if [ "$(DISTRO_CODE)" = "stretch" ]; then echo "-2" ; fi )
PKG_VERSION := $(basename $(OMD_VERSION))
ARCH := $(shell uname -m)
CMA_PACKAGE:= $(REPO_PATH)/check-mk-$(EDITION)-$(PKG_VERSION)$(CMA_PKG_VERSION_TXT)-$(ARCH).cma

0 comments on commit f0993c0

Please sign in to comment.
You can’t perform that action at this time.