diff options
| author | Eric Le Bihan <eric.le.bihan.dev@free.fr> | 2017-06-12 12:00:07 +0100 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2017-06-28 20:17:13 +0300 |
| commit | 0069a613ac3b6ca75315cbb2fd3d86b0f6c9ede4 (patch) | |
| tree | e3149ff47e681c34b20c789e757f4fd359126e5e | |
| parent | b7ad1fc50b057027afeaee895580f84eeb2c2731 (diff) | |
Fix khrplatform.h not installed if EGL is disabled.
KHR/khrplatform.h is required by the EGL, GLES and VG headers, but is
only installed if Mesa3d is compiled with EGL support.
This patch installs this header file unconditionally.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77240
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 2154defcd698c7f9862bd235925cac75c0d5a520)
| -rw-r--r-- | src/egl/Makefile.am | 3 | ||||
| -rw-r--r-- | src/mapi/Makefile.am | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 14fd77f14a9..81090387b58 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -163,9 +163,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = main/egl.pc -khrdir = $(includedir)/KHR -khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h - egldir = $(includedir)/EGL egl_HEADERS = \ $(top_srcdir)/include/EGL/eglext.h \ diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am index 7ebe14f5207..3133462ccc4 100644 --- a/src/mapi/Makefile.am +++ b/src/mapi/Makefile.am @@ -245,3 +245,6 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) $(srcdir)/glapi/gen/gl_and_es_API.xml > $@ include $(top_srcdir)/install-lib-links.mk + +khrdir = $(includedir)/KHR +khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h |