Module: check_mk
Branch: master
Commit: 109099dfa7bed50d00b4bbb04902e3ca89619805
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=109099dfa7bed5…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jul 28 10:16:28 2017 +0200
Pack check_mk package source tarfile during "make dist"
Change-Id: Iab829f3b15167d00c0cd108a92b74499647fe7c7
---
Makefile | 4 ++--
omd/packages/check_mk/Makefile | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index daa490c..b46594f 100644
--- a/Makefile
+++ b/Makefile
@@ -190,12 +190,12 @@ check-version:
# is currently not used by most distros
# Would also use --exclude-vcs, but this is also not available
# And --transform is also missing ...
-dist: mk-livestatus-$(VERSION).tar.gz config.h.in configure
+dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in configure
@EXCLUDES= ; \
if [ -d .git ]; then \
git rev-parse --short HEAD > COMMIT ; \
for X in $$(git ls-files --directory --others -i --exclude-standard) ; do \
- if [[ $$X != aclocal.m4 && $$X != config.h.in && $$X != configure ]];
then \
+ if [[ $$X != aclocal.m4 && $$X != config.h.in && $$X != configure
&& $$X != $(DISTNAME).tar.gz ]]; then \
EXCLUDES+=" --exclude $${X%*/}" ; \
fi ; \
done ; \
diff --git a/omd/packages/check_mk/Makefile b/omd/packages/check_mk/Makefile
index 538397b..903fc83 100644
--- a/omd/packages/check_mk/Makefile
+++ b/omd/packages/check_mk/Makefile
@@ -7,7 +7,9 @@ DISTNAME = $(NAME)-$(CMK_VERSION)
.PHONY: skel
build: clean
- $(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) ; \
mkdir bin ; \