adjust confdir patch for v0.35.1 rather than master

This commit is contained in:
xenofem 2023-04-23 01:03:50 -04:00
parent 6f73a7d50c
commit 2c2216b8f4

View file

@ -1,13 +1,13 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 4aada48731..39a37853de 100644 index acaa39f764..b4efc581dc 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -1655,7 +1655,7 @@ sys.stdout.write(features) @@ -1625,7 +1625,7 @@ sys.stdout.write(features)
''' '''
feature_str = run_command(python, '-c', feature_sort, feature_keys, check: true).stdout() feature_str = run_command(python, '-c', feature_sort, feature_keys, check: true).stdout()
conf_data.set_quoted('FULLCONFIG', feature_str) conf_data.set_quoted('FULLCONFIG', feature_str)
-conf_data.set_quoted('MPV_CONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpv')) -conf_data.set_quoted('MPV_CONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpv'))
+conf_data.set_quoted('MPV_CONFDIR', '/etc/mpv') +conf_data.set_quoted('MPV_CONFDIR', '/etc/mpv')
conf_data.set_quoted('PLATFORM', host_machine.system())
configure_file(output : 'config.h', configuration : conf_data) configure_file(output : 'config.h', configuration : conf_data)
message('List of enabled features: ' + feature_str) message('List of enabled features: ' + feature_str)