Mesa (master): driconf: move ${sysconfdir}/drirc to ${datadir}/drirc.d/00-mesa-defaults.conf

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 30b10dbb7c6f6bdf3e489620f8333c727bd3a6dd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=30b10dbb7c6f6bdf3e489620f8333c727bd3a6dd

Author: Qiang Yu <Qiang.Yu at amd.com>
Date:   Mon Aug  6 11:19:24 2018 +0800

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 <Qiang.Yu at amd.com>
Acked-by: Michel Dänzer <michel.daenzer at amd.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/util/{drirc => 00-mesa-defaults.conf} | 0
 src/util/Makefile.am                      | 5 +++--
 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
similarity index 100%
rename from src/util/drirc
rename to src/util/00-mesa-defaults.conf
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 8d8c1566e1..efb94caff7 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 9740dafae3..a4ff0b92ed 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',