From e40b867145160dfb258a6f03c7e6b02f3f839aa4 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 30 Mar 2016 10:30:42 -0700 Subject: [PATCH] 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. --- src/intel/vulkan/.gitignore | 3 +-- src/intel/vulkan/{intel_icd.json.in => intel_icd.json} | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) rename src/intel/vulkan/{intel_icd.json.in => intel_icd.json} (59%) diff --git a/src/intel/vulkan/.gitignore b/src/intel/vulkan/.gitignore index 40afc2e..4a683b4 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.in b/src/intel/vulkan/intel_icd.json similarity index 59% rename from src/intel/vulkan/intel_icd.json.in rename to src/intel/vulkan/intel_icd.json index d9b363a..277c14e 100644 --- a/src/intel/vulkan/intel_icd.json.in +++ b/src/intel/vulkan/intel_icd.json @@ -1,7 +1,7 @@ { "file_format_version": "1.0.0", "ICD": { - "library_path": "@install_libdir@/libvulkan_intel.so", + "library_path": "libvulkan_intel.so", "abi_versions": "1.0.3" } } -- 2.7.4