Mesa (master): anv: Always use the full driver path in the intel_icd.*.json

[Jason Ekstrand]

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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Oct 20 16:04:16 2016 -0700

anv: Always use the full driver path in the intel_icd.*.json

Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Cc: "13.0" <mesa-stable at lists.freedesktop.org>

---

 src/intel/vulkan/Makefile.am       | 8 +-------
 src/intel/vulkan/intel_icd.json.in | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index ca5bf9f..069e363 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -176,15 +176,9 @@ dev_icd.json : dev_icd.json.in
 		-e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
 		< $(srcdir)/dev_icd.json.in > $@
 
-if VULKAN_ICD_DRIVER_PATH
-ICD_DRIVER_PATH="${libdir}/libvulkan_intel.so"
-else
-ICD_DRIVER_PATH="libvulkan_intel.so"
-endif
-
 intel_icd. at host_cpu@.json : intel_icd.json.in
 	$(AM_V_GEN) $(SED) \
-		-e "s#@ICD_DRIVER_PATH@#${ICD_DRIVER_PATH}#" \
+		-e "s#@install_libdir@#${libdir}#" \
 		< $(srcdir)/intel_icd.json.in > $@
 
 # Libvulkan with dummy gem. Used for unit tests.
diff --git a/src/intel/vulkan/intel_icd.json.in b/src/intel/vulkan/intel_icd.json.in
index 4f50866..d9b363a 100644
--- a/src/intel/vulkan/intel_icd.json.in
+++ b/src/intel/vulkan/intel_icd.json.in
@@ -1,7 +1,7 @@
 {
     "file_format_version": "1.0.0",
     "ICD": {
-        "library_path": "@ICD_DRIVER_PATH@",
+        "library_path": "@install_libdir@/libvulkan_intel.so",
         "abi_versions": "1.0.3"
     }
 }