X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fversion.c;h=3630950bbcd0eb63b47f99fd86f2e13318f634d6;hb=4ba92f185fb1d0b112cbc804a261939f5f81dc34;hp=8631cf9482cce8f853fa4dd8530a6c1f9bf600da;hpb=314d52225ce6d9b81d48b7645b035b1c93875369;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/version.c b/src/bin/lttng/commands/version.c
index 8631cf948..3630950bb 100644
--- a/src/bin/lttng/commands/version.c
+++ b/src/bin/lttng/commands/version.c
@@ -15,7 +15,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <popt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -23,7 +23,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <config.h>
 
 #include <common/mi-lttng.h>
 
@@ -65,7 +64,7 @@ static void create_version(struct mi_lttng_version *version)
 	version->version_major = VERSION_MAJOR;
 	version->version_minor = VERSION_MINOR;
 	version->version_patchlevel = VERSION_PATCHLEVEL;
-	strncpy(version->version_commit, FULL_VERSION, NAME_MAX);
+	strncpy(version->version_commit, GIT_VERSION, NAME_MAX);
 	strncpy(version->version_name, VERSION_NAME, NAME_MAX);
 	strncpy(version->package_url, PACKAGE_URL, NAME_MAX);
 }
@@ -149,7 +148,7 @@ int cmd_version(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stdout);
+			SHOW_HELP();
 			goto end;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
@@ -164,7 +163,8 @@ int cmd_version(int argc, const char **argv)
 	if (lttng_opt_mi) {
 		ret = print_mi();
 	} else {
-		MSG("lttng version " FULL_VERSION " - " VERSION_NAME);
+		MSG("lttng version " VERSION " - " VERSION_NAME "%s",
+			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
 		MSG("\n" VERSION_DESCRIPTION "\n");
 		MSG("Web site: http://lttng.org");
 		MSG("\n%s", lttng_license);