diff options
| author | Qiang Yu <[email protected]> | 2018-08-06 11:19:24 +0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-08-17 17:16:32 +0100 |
| commit | 30b10dbb7c6f6bdf3e489620f8333c727bd3a6dd (patch) | |
| tree | f9df5d7ce98646bfcef3e3a8415e32c9c122ad32 | |
| parent | 04bdbbcab3c4862bf3f54ce60fcc1d2007776f80 (diff) | |
driconf: move ${sysconfdir}/drirc to ${datadir}/drirc.d/00-mesa-defaults.conf
${sysconfdir} is for store admin config files, so move
this mesa default config file to ${datadir}/drirc.d.
Signed-off-by: Qiang Yu <[email protected]>
Acked-by: Michel Dänzer <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/util/00-mesa-defaults.conf (renamed from src/util/drirc) | 0 | ||||
| -rw-r--r-- | src/util/Makefile.am | 5 | ||||
| -rw-r--r-- | src/util/meson.build | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/util/drirc b/src/util/00-mesa-defaults.conf index c4f9e060f3a..c4f9e060f3a 100644 --- a/src/util/drirc +++ b/src/util/00-mesa-defaults.conf diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 8d8c1566e1e..efb94caff71 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -72,7 +72,8 @@ libxmlconfig_la_CFLAGS = \ $(EXPAT_CFLAGS) libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm -sysconf_DATA = drirc +drircdir = $(datadir)/drirc.d +drirc_DATA = 00-mesa-defaults.conf u_atomic_test_LDADD = libmesautil.la roundeven_test_LDADD = -lm @@ -84,7 +85,7 @@ TESTS = $(check_PROGRAMS) BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - drirc \ + 00-mesa-defaults.conf \ format_srgb.py \ merge_driinfo.py \ SConscript \ diff --git a/src/util/meson.build b/src/util/meson.build index 9740dafae30..a4ff0b92ed6 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -89,7 +89,7 @@ files_mesa_util = files( 'vma.h', ) -install_data('drirc', install_dir : get_option('sysconfdir')) +install_data('00-mesa-defaults.conf', install_dir : join_paths(get_option('datadir'), 'drirc.d')) files_xmlconfig = files( 'xmlconfig.c', |