Revert "adjust confdir patch for v0.35.1 rather than master"

This reverts commit 2c2216b8f4.
main
xenofem 2023-04-23 02:19:17 -04:00
parent 4f950c6af9
commit 681260bdb6
1 changed files with 3 additions and 3 deletions

View File

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