anv: remove custom rule to install the intel_icd.json
authorEmil Velikov <emil.l.velikov@gmail.com>
Fri, 29 Apr 2016 15:26:45 +0000 (16:26 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Sun, 1 May 2016 07:38:04 +0000 (08:38 +0100)
Autoconf already does the exact same thing as the manually written rule.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94969
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
src/intel/vulkan/Makefile.am

index 983b4c2..5737474 100644 (file)
@@ -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
 # The following is used for development purposes, by setting VK_ICD_FILENAMES.
 noinst_DATA = dev_icd.json
@@ -213,6 +207,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 $(DESTDIR)/$(VULKAN_ICD_INSTALL_DIR)/intel_icd.json