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 40afc2e39899d96a269d4735f6ddec5647cc6f23..4a683b45487516cd24a514d65139ca4970c66d24 100644 (file)
--- 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 (file)
index 0000000..277c14e
--- /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 (file)
index d9b363a..0000000
--- 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"
-    }
-}