diff options
| author | Emil Velikov <[email protected]> | 2016-04-29 16:26:45 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-01 08:38:04 +0100 |
| commit | 0d3e7b17c9652548117b7fe0efd1be019f37235a (patch) | |
| tree | d7c64b417f25e941d26ed1f481b40cf6cac41f1a | |
| parent | 30e6f68b3bca2a8cb17c3c61b5e8ebd58bc504e7 (diff) | |
anv: remove custom rule to install the intel_icd.json
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 <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 983b4c2af28..57374742d85 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 # 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 |