[Mesa-dev] [PATCH 05/25] anv: remove custom rule to install the intel_icd.json

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Autoconf already does the exact same thing as the manually written rule.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---

IMHO we can/should nuke --with-vulkan-icddir all together and/or
change it to /usr/share vs /etc (according to the Vulkan docs). If there
is something to control that should be the location of the module, right?

-Emil

 src/intel/vulkan/Makefile.am | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 071d118..cf7b234 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -184,13 +184,7 @@ libvulkan_intel_la_LDFLAGS = \
 	$(LD_NO_UNDEFINED)
 
 
-# Generate icd files. It would be nice to just be able to add these to
-# AC_CONFIG_FILES, but @libdir@ typically expands to '${exec_prefix}/lib64',
-# which we can't put in the icd file. When running sed from the Makefile we
-# can use ${libdir}, which expands completely and we avoid putting Makefile
-# variables in the icd file.
-
-icdconfdir=$(sysconfdir)/vulkan/icd.d
+icdconfdir = @VULKAN_ICD_INSTALL_DIR@
 icdconf_DATA = intel_icd.json
 
 # Libvulkan with dummy gem. Used for unit tests.
@@ -206,6 +200,3 @@ libvulkan_test_la_CFLAGS =                              \
 libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD)
 
 include $(top_srcdir)/install-lib-links.mk
-
-install-data-local:
-	$(INSTALL_DATA) -D $(srcdir)/intel_icd.json $(VULKAN_ICD_INSTALL_DIR)/intel_icd.json
-- 
2.8.0