Module: check_mk
Branch: master
Commit: 85e2880a63f853c05172de50870d23cdc4a401a7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85e2880a63f853…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Dec 12 12:42:50 2014 +0100
Fixed building rpm/deb during release
---
agents/Makefile | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/agents/Makefile b/agents/Makefile
index 4699995..bae1e2b 100644
--- a/agents/Makefile
+++ b/agents/Makefile
@@ -53,7 +53,9 @@ waitmax: waitmax.c
@echo "Fine. Typing 'make install' as root now will install into
/usr/bin"
setversion:
- git rm -f *.rpm *.deb || true
+ if [ -d ../.git ]; then \
+ git rm -f *.rpm *.deb || true ; \
+ fi
sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ;
\
sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/'
check_mk_agent.openvms ; \
for agent in check_mk_agent.*; do \
@@ -62,7 +64,9 @@ setversion:
fi ; \
done ; \
$(MAKE) packages
- git add *.rpm *.deb
+ if [ -d ../.git ]; then \
+ git add *.rpm *.deb ; \
+ fi
$(MAKE) -C windows NEW_VERSION=$(NEW_VERSION) setversion
packages: rpm deb