From: Stéphane Graber <stgraber@ubuntu.com>
Date: Fri, 5 Jan 2018 20:20:55 +0000 (-0500)
Subject: Include -devel suffix in version string
X-Git-Tag: lxc-3.0.0.beta1~83^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2075%2Fhead;p=thirdparty%2Flxc.git

Include -devel suffix in version string

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

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);
 }