From b99fff024f6aa1dc05e907309c9cea13f23a117f Mon Sep 17 00:00:00 2001
From: Francesco Abbate <francesco.bbt@gmail.com>
Date: Wed, 26 Jun 2019 15:05:42 +0200
Subject: [PATCH] Complete Meson to install correctly all the required files

---
 lang/meson.build | 16 +++++++++++-----
 src/meson.build  | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/lang/meson.build b/lang/meson.build
index a3cdcd3..4927a97 100644
--- a/lang/meson.build
+++ b/lang/meson.build
@@ -2,9 +2,15 @@ lang_sources = ['ast-boolean-const-eval.lua', 'ast-const-eval.lua', 'bcread.lua'
 
 luajit = find_program('luajit')
 
-bc_generator = generator(luajit,
-    arguments: ['-b', '@INPUT@', '@OUTPUT@'],
-    output  : '@BASENAME@.h',
-)
+lang_bc_headers = []
+foreach lua_source : lang_sources
+    lang_bc_headers += custom_target(lua_source + '.h',
+        input: lua_source,
+        output: '@BASENAME@.h',
+        command: [luajit, '-b', '@INPUT@', '@OUTPUT@']
+    )
+endforeach
 
-lang_bc_headers = bc_generator.process(lang_sources)
+lua_module_install_dir = 'share/lua/5.1'
+
+install_data(lang_sources, install_dir: lua_module_install_dir + '/lang')
diff --git a/src/meson.build b/src/meson.build
index a51333e..22a4bde 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,29 +1,31 @@
-lang_cargs = []
+lang_cflags = []
 
 if host_machine.system() == 'darwin'
-    lang_cargs += ['-pagezero_size', '10000', '-image_base', '100000000']
+    lang_cflags += ['-pagezero_size', '10000', '-image_base', '100000000']
 endif
 
 lang_sources = ['language.c', 'language_loaders.c']
 
 if get_option('preload')
-  lang_sources += 'language_bcloader.c'
-  lang_cargs += '-DBC_PRELOAD'
+    lang_sources += 'language_bcloader.c'
+    lang_cflags += '-DBC_PRELOAD'
 endif
 
 luajit_dep = dependency('luajit')
 
 liblang = static_library('liblang',
-    lang_sources,
+    lang_sources + lang_bc_headers,
     include_directories: lang_headers_dir,
-    c_args: lang_cargs,
+    c_args: lang_cflags,
     dependencies: luajit_dep,
+    install: true,
 )
 
 luajit_x = executable('luajit-x',
-    'luajit-x.c',
+    ['luajit-x.c'] + lang_bc_headers,
     include_directories: lang_headers_dir,
     dependencies: luajit_dep,
-    c_args: lang_cargs,
-    link_with: liblang
+    c_args: lang_cflags,
+    link_with: liblang,
+    install: true,
 )