Merge pull request #2075 from stgraber/master

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])
 

src/lxc/lxc_init.c

@@ -63,7 +63,7 @@ static void interrupt_handler(int sig)
 
 static struct option long_options[] = {
 	    { "name",        required_argument, 0, 'n'         },
-     	    { "help",        no_argument,       0, 'h'         },
+	    { "help",        no_argument,       0, 'h'         },
 	    { "usage",       no_argument,       0, OPT_USAGE   },
 	    { "version",     no_argument,       0, OPT_VERSION },
 	    { "quiet",       no_argument,       0, 'q'         },
@@ -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);
 }
 

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