[checkmk-commits] Unbreak .f12 in livestatus and enterprise.

Module: check_mk Branch: master Commit: b6c9ce05632ce2579c0577828d48d357e9fc9c82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c9ce05632ce2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 8 10:54:58 2017 +0100 Unbreak .f12 in livestatus and enterprise. Change-Id: I7a08be42e11c04742c82240a085eeccf7d42cfd1 --- Makefile | 3 ++- livestatus/.f12 | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f9f6aeb..9bc1878 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,8 @@ cmc-$(VERSION).tar.gz: config.h rm -rf cmc-$(VERSION) build: config.h - $(MAKE) -C enterprise/core -j8 + LANG=C $(MAKE) -C livestatus -j8 + LANG=C $(MAKE) -C enterprise/core -j8 $(MAKE) -C enterprise/locale all install: diff --git a/livestatus/.f12 b/livestatus/.f12 index 9ea9892..b813963 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -1,9 +1,10 @@ #!/bin/bash +set -e + SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -set -e -make -C .. livestatus/config.h +make -C .. config.h make -j8 sudo install src/livestatus.o /omd/sites/$SITE/lib/mk-livestatus/livestatus.o (cd api/python ; bash .f12 )