From 5038fe70efa193f1b5dd0a3e4e4525eb95980afe Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 5 Nov 2017 17:24:09 +0100 Subject: [PATCH] add Meson option "lyrics_plugin_dir" The option "--with-lyrics-plugin-dir" was lost in the Meson transition. Closes #7 --- NEWS | 1 + meson.build | 6 +++++- meson_options.txt | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d202e74..9e7b11c 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ ncmpc 0.29 - not yet released * fix crash after losing MPD connection * fix crash after DNS lookup error +* add Meson option "lyrics_plugin_dir" ncmpc 0.28 - (2017-09-21) * fix crash on lyrics screen diff --git a/meson.build b/meson.build index b2fd42a..428e41e 100644 --- a/meson.build +++ b/meson.build @@ -271,7 +271,11 @@ conf.set('ENABLE_LYRICS_SCREEN', enable_lyrics_screen) if enable_lyrics_screen sources += ['src/screen_lyrics.c', 'src/lyrics.c'] - lyrics_plugin_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'lyrics') + lyrics_plugin_dir = get_option('lyrics_plugin_dir') + if lyrics_plugin_dir == '' + lyrics_plugin_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'lyrics') + endif + conf.set_quoted('LYRICS_PLUGIN_DIR', lyrics_plugin_dir) install_data( 'lyrics/10-hd.sh', diff --git a/meson_options.txt b/meson_options.txt index 4f58ed3..7f7a971 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -68,6 +68,10 @@ option('lyrics_screen', type: 'boolean', value: false, description: 'Enable the lyrics screen') +option('lyrics_plugin_dir', type: 'string', + value: '', + description: 'Directory where lyrics plugins are stored') + option('outputs_screen', type: 'boolean', value: true, description: 'Enable the outputs screen') -- 2.30.2