[checkmk-commits] Windows agent: fix make target 'setversion'

Module: check_mk Branch: master Commit: 1e74b062ad331e4f075c1d664b0522dbd1c33bcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e74b062ad331e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Jan 11 15:03:59 2018 +0100 Windows agent: fix make target 'setversion' Due to the peculiarities in the way we set the version number and the mixture of manual make + autotools projects, the version number of the Windows agent must be set in the manual Makefile in the agents directory. Change-Id: Ib97c503a0d8760a2b66fc4b13f88b939f1264f6b --- agents/Makefile | 4 ++++ agents/windows/Makefile.am | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index 5a5aac3..d8f75a7 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -61,6 +61,10 @@ setversion: sed -i 's/echo Version: [0-9.a-z-]*/'"echo Version: $(NEW_VERSION)/g" $$agent; \ fi ; \ done + package="Check_MK Windows Agent" ; \ + mail=feedback(a)check-mk.org ; \ + sed -i "s/^AC_INIT.*/AC_INIT([$$package], [$(NEW_VERSION)], [$$mail])/" \ + windows/configure.ac build: $(MAKE) packages diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 19386e4..c3b27ab 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -116,9 +116,3 @@ CLEANFILES = \ $(addprefix $(bindir)/,$(bin_PROGRAMS)) \ $(patsubst %$(EXEEXT),%-64$(EXEEXT),$(addprefix $(bindir)/,$(bin_PROGRAMS))) \ $(patsubst %$(EXEEXT),%.msi,$(addprefix $(bindir)/,$(bin_PROGRAMS))) - -setversion: - package="Check_MK Windows Agent" ; \ - mail=feedback(a)check-mk.org ; \ - sed -i "s/^AC_INIT.*/AC_INIT([$$package], [$(NEW_VERSION)], [$$mail])/" \ - $(VPATH)/configure.ac