]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Include -devel suffix in version string 2075/head
authorStéphane Graber <stgraber@ubuntu.com>
Fri, 5 Jan 2018 20:20:55 +0000 (15:20 -0500)
committerStéphane Graber <stgraber@ubuntu.com>
Fri, 5 Jan 2018 21:25:28 +0000 (16:25 -0500)
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
configure.ac
src/lxc/lxc_init.c
src/lxc/tools/arguments.c

index e4312185cd23a58ed8374892727863062b35b16f..0bcd75a280260fa3ca84a9b8acbd4af5c255bdd3 100644 (file)
@@ -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])
 
index e460f7de1a94cadf9298dcedc144a8819ab18f06..2879a9399fc611f48830977a6e59ec5276dc990d 100644 (file)
@@ -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);
 }
 
index 0907f66d78a6c61d64ea92d82f3445420de5c6aa..30fb714fd1db3b1c84dc205c2fa4509eefed04ae 100644 (file)
@@ -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);
 }