[Mesa-stable] [PATCH 1/2] targets/opencl: don't hardcode the icd file install to /etc/...

Emil Velikov emil.l.velikov at gmail.com
Mon Oct 16 15:40:07 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

Use $(sysconfdir) instead of hardcoding /etc.

While the OpenCL spec expects the file in /etc, people building their
stack can override that, esp. !Linux users.

Furthermore this removes a fundamental violation, which results in the
system file being overwritten even as one explicitly sets --prefix
and/or DESTDIR.

Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/gallium/targets/opencl/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index c9d2be7afd0..7f55b1a13ea 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -45,7 +45,7 @@ EXTRA_lib at OPENCL_LIBNAME@_la_DEPENDENCIES = opencl.sym
 EXTRA_DIST = mesa.icd opencl.sym
 
 if HAVE_CLOVER_ICD
-icddir = /etc/OpenCL/vendors/
+icddir = $(sysconfdir)/OpenCL/vendors/
 icd_DATA = mesa.icd
 endif
 
-- 
2.14.1



More information about the mesa-stable mailing list