Backport: Use EXTRA_VERSION_NAME and EXTRA_VERSION_DESCRIPTION

[lttng-tools.git] / src / bin / lttng-crash / lttng-crash.c

diff --git a/src/bin/lttng-crash/lttng-crash.c b/src/bin/lttng-crash/lttng-crash.c
index 65fca36ae264c2e25f7d0437840a4a8f194f67b7..5dbf41c583cf93437c97f62ed2566ef88cefa0d3 100644 (file)
--- a/src/bin/lttng-crash/lttng-crash.c
+++ b/src/bin/lttng-crash/lttng-crash.c
@@ -219,9 +219,10 @@ static void usage(void)
 static void version(FILE *ofp)
 {
        fprintf(ofp, "%s (LTTng Crash Trace Viewer) " VERSION " - " VERSION_NAME
-"%s\n",
+"%s%s\n",
                        progname,
-                       GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+                       GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+                       EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
 }
 
 /*
@@ -1137,7 +1138,7 @@ int delete_dir_recursive(const char *path)
                        ret = delete_dir_recursive(subpath);
                        free(subpath);
                        if (ret) {
-                               /* Error occured, abort traversal. */
+                               /* Error occurred, abort traversal. */
                                goto end;
                        }
                } else if (S_ISREG(st.st_mode)) {