diff options
| -rw-r--r-- | src/intel/vulkan/.gitignore | 1 | ||||
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 9 | ||||
| -rw-r--r-- | src/intel/vulkan/intel_icd.json.in (renamed from src/intel/vulkan/intel_icd.json) | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/intel/vulkan/.gitignore b/src/intel/vulkan/.gitignore index bde5cd82f40..725a8584624 100644 --- a/src/intel/vulkan/.gitignore +++ b/src/intel/vulkan/.gitignore @@ -3,3 +3,4 @@ /anv_entrypoints.h /anv_timestamp.h /dev_icd.json +/intel_icd.*.json diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 6e171887f57..7bf68a0fe2c 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -152,7 +152,7 @@ EXTRA_DIST = \ $(top_srcdir)/include/vulkan/vk_icd.h \ anv_entrypoints_gen.py \ dev_icd.json.in \ - intel_icd.json + intel_icd.json.in libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS) @@ -167,7 +167,7 @@ libvulkan_intel_la_LDFLAGS = \ icdconfdir = @VULKAN_ICD_INSTALL_DIR@ -icdconf_DATA = intel_icd.json +icdconf_DATA = intel_icd.@[email protected] # The following is used for development purposes, by setting VK_ICD_FILENAMES. noinst_DATA = dev_icd.json @@ -176,6 +176,11 @@ dev_icd.json : dev_icd.json.in -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ < $(srcdir)/dev_icd.json.in > $@ +intel_icd.@[email protected] : intel_icd.json.in + $(AM_V_GEN) $(SED) \ + -e "s#@install_libdir@#${libdir}#" \ + < $(srcdir)/intel_icd.json.in > $@ + # Libvulkan with dummy gem. Used for unit tests. libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES) libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) diff --git a/src/intel/vulkan/intel_icd.json b/src/intel/vulkan/intel_icd.json.in index 277c14ec444..d9b363a9762 100644 --- a/src/intel/vulkan/intel_icd.json +++ b/src/intel/vulkan/intel_icd.json.in @@ -1,7 +1,7 @@ { "file_format_version": "1.0.0", "ICD": { - "library_path": "libvulkan_intel.so", + "library_path": "@install_libdir@/libvulkan_intel.so", "abi_versions": "1.0.3" } } |