From 97d08498e98e5eb2d84b9c6c5a66320b1c303886 Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Sun, 8 Mar 2020 12:47:58 -0400 Subject: [PATCH] Name as well as version for --version --- meson.build | 3 ++- waybox/main.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 662a858..f9074e2 100644 --- a/meson.build +++ b/meson.build @@ -14,7 +14,8 @@ project( add_project_arguments( '-Wno-unused-parameter', '-DWLR_USE_UNSTABLE', - '-DVERSION="' + meson.project_version() + '"', + '-DPACKAGE_NAME="' + meson.project_name() + '"', + '-DPACKAGE_VERSION="' + meson.project_version() + '"', language: 'c') cc = meson.get_compiler('c') diff --git a/waybox/main.c b/waybox/main.c index fa9b48e..952bc7d 100644 --- a/waybox/main.c +++ b/waybox/main.c @@ -15,7 +15,7 @@ int main(int argc, char **argv) { } else if ((!strcmp("--startup", argv[i]) || !strcmp("-s", argv[i])) && i < argc) { startup_cmd = argv[i + 1]; } else if (!strcmp("--version", argv[i]) || !strcmp("-V", argv[i])) { - printf(VERSION "\n"); + printf(PACKAGE_NAME " " PACKAGE_VERSION "\n"); return 0; } else if (argv[i][0] == '-') { printf("Usage: %s [--debug] [--exit] [--help] [--startup CMD] [--version]\n", argv[0]);