Module: check_mk Branch: master Commit: ec6cf406d000e35b26a7b60df5ae4590d068306c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec6cf406d000e3… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Jul 2 11:14:52 2014 +0200 Fix version in 64 bit Windows agent --- Makefile | 2 +- agents/windows/Makefile | 4 ++-- agents/windows/installer-64.nsi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 442a73a..7ecaf16 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,7 @@ setversion: fi ; \ done ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms - sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ + sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer*.nsi ; \ sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" agents/windows/Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/&#39; livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 98a1538..eddaf93 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -105,10 +105,10 @@ install_agent-64.exe: check_mk_agent-64.exe crash.exe nowin.exe -crash.exe: crash.cc Makefile +crash.exe: crash.cc $(CXX) -o $@ $< -nowin.exe: nowin.cc Makefile +nowin.exe: nowin.cc $(CXX) -o $@ $< clean: diff --git a/agents/windows/installer-64.nsi b/agents/windows/installer-64.nsi index 83b8705..9a2639d 100644 --- a/agents/windows/installer-64.nsi +++ b/agents/windows/installer-64.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.3i1" +!define CHECK_MK_VERSION "1.2.5i5" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on