From: Emil Velikov Date: Mon, 16 Oct 2017 15:40:07 +0000 (+0100) Subject: targets/opencl: don't hardcode the icd file install to /etc/... X-Git-Tag: android-x86-8.1-r1~8232 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0cd09585441d15ef1ff49de497008103f0b0e1ac;p=android-x86%2Fexternal-mesa.git targets/opencl: don't hardcode the icd file install to /etc/... 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@lists.freedesktop.org Signed-off-by: Emil Velikov Reviewed-by: Francisco Jerez Reviewed-By: Aaron Watry --- 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@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