---
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 1dee84b..ec7a638 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -175,15 +175,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.@[email protected] : 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"
}
}
--
2.5.0.400.gff86faf
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
