[Mesa-dev] [PATCH v3 3/6] driconf: move ${sysconfdir}/drirc to ${datadir}/drirc.d/00-mesa-defaults.conf

Qiang Yu Qiang.Yu at amd.com
Mon Aug 6 03:19:24 UTC 2018


${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>
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(-)
 rename src/util/{drirc => 00-mesa-defaults.conf} (100%)

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 8d8c156..efb94ca 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 108524b..16c3ef9 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',
-- 
2.7.4



More information about the mesa-dev mailing list