Module: check_mk
Branch: master
Commit: a69fab347bc16e75b96bf3fb04c4926c338023e3
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a69fab347bc16e…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Feb 6 11:45:46 2019 +0100
mk_jolokia.exe: Adapt Makefile for frozen binary
Change-Id: If893c75b730f2b672b27fd5c649a03d3b0c9eb2b
---
agents/windows/frozen_binaries/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/agents/windows/frozen_binaries/Makefile
b/agents/windows/frozen_binaries/Makefile
index 17b9362..05a7155 100644
--- a/agents/windows/frozen_binaries/Makefile
+++ b/agents/windows/frozen_binaries/Makefile
@@ -37,7 +37,7 @@ mk_logwatch.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES)
src/vcredis
cp $(BUILD_DIR)/drive_c/compile/dist/mk_logwatch.exe ../plugins
rm -rf $(BUILD_DIR)
-mk_jolokia.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredist_x86.exe
$(PLUGINS_DIR)/mk_jolokia
+mk_jolokia.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredist_x87.exe
$(PLUGINS_DIR)/mk_jolokia.py
mkdir $(BUILD_DIR) ; \
cd $(BUILD_DIR) ; \
cp -pr $(CURDIR)/src/* . ; \
@@ -54,7 +54,7 @@ mk_jolokia.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES)
src/vcredist
cd drive_c/pip ; \
wine c:\\Python27\\python.exe -m pip install --no-index
--find-links="c:\\pip" * ; \
mkdir $(BUILD_DIR)/drive_c/compile ; \
- cp $(PLUGINS_DIR)/mk_jolokia $(BUILD_DIR)/drive_c/compile/mk_jolokia.py ; \
+ cp $(PLUGINS_DIR)/mk_jolokia.py $(BUILD_DIR)/drive_c/compile/mk_jolokia.py ; \
cd $(BUILD_DIR)/drive_c/compile ; \
wine c:\\Python27\\Scripts\\pyinstaller.exe \
--clean \