Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Veksler <Mihails.Vekslers@zabbix.com>2019-10-17 10:08:42 +0300
committerMichael Veksler <Mihails.Vekslers@zabbix.com>2019-10-17 10:24:33 +0300
commit97f5cd55352cfa653f3d986394d98e9080c99204 (patch)
tree81cba365276debf7b406f57845556a817de00f2c /Makefile.am
parent75d363ec9f5dd828885fac9b346404f214a16186 (diff)
....I..... [ZBX-15211] added key 'tests' for bootstrap.sh when working with cmocka tests
* commit 'fce1c3c08eb6d30f2057825196d73741f5e460fd': ....I..... [ZBX-15211] added key 'tests' for bootstrap.sh when working with cmocka tests (cherry picked from commit 9e0f06df8c7e929feb402d30d8d987de7c6ddc01) (cherry picked from commit 1fb1a96f635bd913f991df4fafa83fbd6904700c)
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 63632cf196d..fcefa8206a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,8 +57,7 @@ dist-hook:
$(top_distdir)/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java; \
cat $(top_distdir)/go/src/zabbix/pkg/version/version.go|sed "s/{ZABBIX_RC_NUM}/$$branch$$type_num$$type_count/g"| \
sed "s/{ZABBIX_REVISION}/$$zabbix_revision/g" > $(top_distdir)/go/src/zabbix/pkg/version/version.go.new; \
- mv $(top_distdir)/go/src/zabbix/pkg/version/version.go.new $(top_distdir)/go/src/zabbix/pkg/version/version.go; \
- rm -f $(top_distdir)/conf_tests.m4
+ mv $(top_distdir)/go/src/zabbix/pkg/version/version.go.new $(top_distdir)/go/src/zabbix/pkg/version/version.go
rm -rf `find $(top_distdir) -name ".gitignore" -o -name ".gitattributes"`
rm -f $(top_distdir)/include/config.h