From c1b7a2d4372dff90e4952a9f137f685b777d073e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Sat, 23 Sep 2017 11:09:38 +0200 Subject: [PATCH 1/2] Make lyrics_plugin_dir configurable again See: https://github.com/MusicPlayerDaemon/ncmpc/issues/7 --- meson.build | 2 +- meson_options.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b2fd42a..5255b2a 100644 --- a/meson.build +++ b/meson.build @@ -271,7 +271,7 @@ 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 = join_paths(get_option('prefix'), get_option('lyrics_plugin_dir')) 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..92e83e6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -79,3 +79,7 @@ option('chat_screen', type: 'boolean', option('documentation', type: 'boolean', value: false, description: 'Build API documentation') + +option('lyrics_plugin_dir', type: 'string', + value: 'lib/ncmpc/lyrics', + description: 'Directory where lyrics plugins are stored') -- 2.14.2