Mesa (staging/19.2): meson: split Mesa headers as a separate installation

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: 089aa74d571af2ca22f5832d1a8c1eb4be29c360
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=089aa74d571af2ca22f5832d1a8c1eb4be29c360

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Mon Sep 30 14:06:07 2019 +0100

meson: split Mesa headers as a separate installation

Fixes: 93df862b6affb6b8507e ("meson: re-add incorrect pkg-config files with GLVND for backward compatibility")
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit 1a7e9652c499340a4f269cae147a68ed553a9a6c)

---

 include/meson.build | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/meson.build b/include/meson.build
index 082d8d66876..149b122236b 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -74,6 +74,13 @@ if with_egl
     'EGL/egl.h',
     'EGL/eglext.h',
     'EGL/eglplatform.h',
+    subdir : 'EGL',
+  )
+endif
+
+# Non-upstream headers
+if with_egl
+  install_headers(
     'EGL/eglmesaext.h',
     'EGL/eglextchromium.h',
     subdir : 'EGL',