From 61dac912e612aadc9458f890b76ab394b32c6056 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Fri, 27 Jan 2017 19:13:48 -0500
Subject: [PATCH] build: Clean up some Meson usage

---
 include/epoxy/meson.build | 8 ++++----
 meson.build               | 8 ++++----
 src/meson.build           | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/epoxy/meson.build b/include/epoxy/meson.build
index 38fe4ad..545e991 100644
--- a/include/epoxy/meson.build
+++ b/include/epoxy/meson.build
@@ -8,7 +8,7 @@ gl_generated = custom_target('gl_generated.h',
                                gen_dispatch_py,
                                '--header',
                                '--no-source',
-                               '--outputdir=' + meson.current_build_dir(),
+                               '--outputdir=@OUTDIR@',
                                '@INPUT@'
                              ],
                              install: true,
@@ -28,7 +28,7 @@ if build_egl
                                   gen_dispatch_py,
                                   '--header',
                                   '--no-source',
-                                  '--outputdir=' + meson.current_build_dir(),
+                                  '--outputdir=@OUTDIR@',
                                   '@INPUT@'
                                 ],
                                 install: true,
@@ -48,7 +48,7 @@ if build_glx
                                   gen_dispatch_py,
                                   '--header',
                                   '--no-source',
-                                  '--outputdir=' + meson.current_build_dir(),
+                                  '--outputdir=@OUTDIR@',
                                   '@INPUT@'
                                 ],
                                 install: true,
@@ -68,7 +68,7 @@ if build_wgl
                                   gen_dispatch_py,
                                   '--header',
                                   '--no-source',
-                                  '--outputdir=' + meson.current_build_dir(),
+                                  '--outputdir=@OUTDIR@',
                                   '@INPUT@'
                                 ],
                                 install: true,
diff --git a/meson.build b/meson.build
index 88d5b74..f9ea607 100644
--- a/meson.build
+++ b/meson.build
@@ -140,10 +140,10 @@ python = find_program('python3')
 # Generates the dispatch tables
 gen_dispatch_py = find_program('src/gen_dispatch.py')
 
-gl_registry = join_paths(meson.source_root(), 'registry/gl.xml')
-egl_registry = join_paths(meson.source_root(), 'registry/egl.xml')
-glx_registry = join_paths(meson.source_root(), 'registry/glx.xml')
-wgl_registry = join_paths(meson.source_root(), 'registry/wgl.xml')
+gl_registry = files('registry/gl.xml')
+egl_registry = files('registry/egl.xml')
+glx_registry = files('registry/glx.xml')
+wgl_registry = files('registry/wgl.xml')
 
 libepoxy_inc = [
   include_directories('include'),
diff --git a/src/meson.build b/src/meson.build
index 05d4f7b..f6df778 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,7 +16,7 @@ gl_generated = custom_target('gl_generated_dispatch.c',
                                gen_dispatch_py,
                                '--source',
                                '--no-header',
-                               '--outputdir=' + meson.current_build_dir(),
+                               '--outputdir=@OUTDIR@',
                                '@INPUT@',
                              ])
 
@@ -34,7 +34,7 @@ if build_egl
                                   gen_dispatch_py,
                                   '--source',
                                   '--no-header',
-                                  '--outputdir=' + meson.current_build_dir(),
+                                  '--outputdir=@OUTDIR@',
                                   '@INPUT@',
                                 ])
   gen_sources += [ egl_generated ]                              
@@ -52,7 +52,7 @@ if build_glx
                                   gen_dispatch_py,
                                   '--source',
                                   '--no-header',
-                                  '--outputdir=' + meson.current_build_dir(),
+                                  '--outputdir=@OUTDIR@',
                                   '@INPUT@',
                                 ])
   gen_sources += [ glx_generated ]
@@ -70,7 +70,7 @@ if build_wgl
                                   gen_dispatch_py,
                                   '--source',
                                   '--no-header',
-                                  '--outputdir=' + meson.current_build_dir(),
+                                  '--outputdir=@OUTDIR@',
                                   '@INPUT@',
                                 ])
   gen_sources += [ wgl_generated ]