From 5f98011c3e1bf45e63bfea4e607521b460c4a252 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Fri, 5 Jan 2018 15:20:55 -0500 Subject: [PATCH] Include -devel suffix in version string MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- configure.ac | 4 +++- src/lxc/lxc_init.c | 2 +- src/lxc/tools/arguments.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e4312185c..0bcd75a28 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,9 @@ m4_define([lxc_abi], [lxc_abi_major.lxc_abi_minor.lxc_abi_micro]) m4_define([lxc_version_base], [lxc_version_major.lxc_version_minor.lxc_version_micro]) m4_define([lxc_version], - [ifelse(lxc_version_beta, [], [lxc_version_base], [lxc_version_base.lxc_version_beta])]) + [ifelse(lxc_devel, 1, + ifelse(lxc_version_beta, [], [lxc_version_base], [lxc_version_base.lxc_version_beta])-devel, + ifelse(lxc_version_beta, [], [lxc_version_base], [lxc_version_base.lxc_version_beta]))]) AC_INIT([lxc], [lxc_version]) diff --git a/src/lxc/lxc_init.c b/src/lxc/lxc_init.c index e460f7de1..2879a9399 100644 --- a/src/lxc/lxc_init.c +++ b/src/lxc/lxc_init.c @@ -440,7 +440,7 @@ static void print_usage(const struct option longopts[]) static void print_version() { - printf("%s%s\n", LXC_VERSION, LXC_DEVEL ? "-devel" : ""); + printf("%s\n", LXC_VERSION); exit(0); } diff --git a/src/lxc/tools/arguments.c b/src/lxc/tools/arguments.c index 0907f66d7..30fb714fd 100644 --- a/src/lxc/tools/arguments.c +++ b/src/lxc/tools/arguments.c @@ -132,7 +132,7 @@ static void print_usage(const struct option longopts[], static void print_version() { - printf("%s%s\n", LXC_VERSION, LXC_DEVEL ? "-devel" : ""); + printf("%s\n", lxc_get_version()); exit(0); } -- 2.47.2