From 7afceebf4b8feb5e72fb4b894686deb2b7527502 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 18 Apr 2019 22:52:00 +0200 Subject: [PATCH] Make the default theme dir pick up the --prefix option given to Meson. --- meson.build | 3 +++ nageru/flags.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4ea2b4d..16dcb4e 100644 --- a/meson.build +++ b/meson.build @@ -47,6 +47,9 @@ add_project_arguments('-DMOVIT_SHADER_DIR="' + movit_shader_dir + '"', language: # Make the Nageru version available as a #define. add_project_arguments('-DNAGERU_VERSION="' + meson.project_version() + '"', language: 'cpp') +# Make the prefix (e.g. /usr/local) available as a #define. +add_project_arguments('-DPREFIX="' + get_option('prefix') + '"', language: 'cpp') + # This needs to be done before declaring any build targets. if get_option('cef_dir') != '' add_project_arguments('-DHAVE_CEF=1', language: 'cpp') diff --git a/nageru/flags.h b/nageru/flags.h index 4d990f8..3586500 100644 --- a/nageru/flags.h +++ b/nageru/flags.h @@ -18,7 +18,7 @@ struct Flags { bool uncompressed_video_to_http = false; bool x264_video_to_http = false; bool x264_video_to_disk = false; // Disables Quick Sync entirely. Implies x264_video_to_http == true. - std::vector theme_dirs { ".", "/usr/local/share/nageru" }; + std::vector theme_dirs { ".", PREFIX "/share/nageru" }; std::string recording_dir = "."; std::string theme_filename = "theme.lua"; bool locut_enabled = true; -- 2.39.2