From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 30 Mar 2016 17:30:42 +0000 (-0700)
Subject: anv/intel_icd: Don't provide an absolute path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e40b867145160dfb258a6f03c7e6b02f3f839aa4;p=mesa.git

anv/intel_icd: Don't provide an absolute path

The driver will be installed to $(libdir)/libvulkan_intel.so and just
providing a driver name is enough for the loader.  This also ensures that
multi-arch systems work ok.
---

diff --git a/src/intel/vulkan/.gitignore b/src/intel/vulkan/.gitignore
index 40afc2e3989..4a683b45487 100644
--- a/src/intel/vulkan/.gitignore
+++ b/src/intel/vulkan/.gitignore
@@ -5,5 +5,4 @@
 /wayland-drm-protocol.c
 /wayland-drm-client-protocol.h
 /dev_icd.json
-/intel_icd.json
-/gen*_pack.h
\ No newline at end of file
+/gen*_pack.h
diff --git a/src/intel/vulkan/intel_icd.json b/src/intel/vulkan/intel_icd.json
new file mode 100644
index 00000000000..277c14ec444
--- /dev/null
+++ b/src/intel/vulkan/intel_icd.json
@@ -0,0 +1,7 @@
+{
+    "file_format_version": "1.0.0",
+    "ICD": {
+        "library_path": "libvulkan_intel.so",
+        "abi_versions": "1.0.3"
+    }
+}
diff --git a/src/intel/vulkan/intel_icd.json.in b/src/intel/vulkan/intel_icd.json.in
deleted file mode 100644
index d9b363a9762..00000000000
--- a/src/intel/vulkan/intel_icd.json.in
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "file_format_version": "1.0.0",
-    "ICD": {
-        "library_path": "@install_libdir@/libvulkan_intel.so",
-        "abi_versions": "1.0.3"
-    }
-}