anv/intel_icd: Don't provide an absolute path
authorJason Ekstrand <jason.ekstrand@intel.com>
Wed, 30 Mar 2016 17:30:42 +0000 (10:30 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Thu, 14 Apr 2016 22:15:00 +0000 (15:15 -0700)
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
src/intel/vulkan/intel_icd.json [moved from src/intel/vulkan/intel_icd.json.in with 59% similarity]

index 40afc2e..4a683b4 100644 (file)
@@ -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
similarity index 59%
rename from src/intel/vulkan/intel_icd.json.in
rename to src/intel/vulkan/intel_icd.json
index d9b363a..277c14e 100644 (file)
@@ -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"
     }
 }