Include -devel suffix in version string

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

diff --git a/configure.ac b/configure.ac
index 8b51dc38a9c16dedfb95796e36458b284c23f85e..2f20e867ae5ac7bf31df6b9c7e20728a2ebb81cf 100644 (file)
--- 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 810cca3ef457d7c2523e83fc8f47ba88e937f457..60667036ac5adf2270d106a19754435dc852a461 100644 (file)
--- a/src/lxc/lxc_init.c
+++ b/src/lxc/lxc_init.c
@@ -432,7 +432,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 f16b19562c44d19a210cde68fc4eda7f4ff8796a..9a2dcfbb9529abcc26f99bffcf530c8ea2d759a9 100644 (file)
--- a/src/lxc/tools/arguments.c
+++ b/src/lxc/tools/arguments.c
@@ -32,9 +32,11 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <lxc/lxccontainer.h>
+#include <lxc/version.h>
+
 #include "arguments.h"
 #include "utils.h"
-#include "version.h"
 
 static int build_shortopts(const struct option *a_options, char *a_shortopts,
                           size_t a_size)
@@ -131,7 +133,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);
 }