diff options
| author |  Calvin Rose <calsrose@gmail.com> | 2023-09-27 19:06:14 -0500 |
|---|---|---|
| committer | Calvin Rose <calsrose@gmail.com> | 2023-09-27 19:06:14 -0500 |
| commit | 964295b59d0513516de5d1ac4edfc1102432efc7 (patch) | |
| tree | 63c73f570b1e72d0f34ed3b8f14be012842ffd12 /meson.build | |
| parent | Update meson build once more. (diff) | |
| parent | Fix meson install test. (diff) | |
Merge branch 'net-reworkings'
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 1f0cb929..7e8d8d56 100644 --- a/meson.build +++ b/meson.build @@ -169,7 +169,7 @@ janet_boot = executable('janet-boot', core_src, boot_src, # Build janet.c janetc = custom_target('janetc', - input : [janet_boot], + input : [janet_boot, 'src/boot/boot.janet'], output : 'janet.c', capture : true, command : [ @@ -288,12 +288,16 @@ patched_janet = custom_target('patched-janeth', install : true, install_dir : join_paths(get_option('includedir'), 'janet'), build_by_default : true, +<<<<<<< HEAD output : ['_janet.h'], +======= + output : ['janet_' + meson.project_version() + '.h'], +>>>>>>> @{-1} command : [janet_nativeclient, '@INPUT@', '@OUTPUT@']) # Create a version of the janet.h header that matches what jpm often expects if meson.version().version_compare('>=0.61') - install_symlink('janet.h', pointing_to: 'janet/_janet.h', install_dir: get_option('includedir')) - install_symlink('janet.h', pointing_to: '_janet.h', install_dir: join_paths(get_option('includedir'), 'janet')) + install_symlink('janet.h', pointing_to: 'janet/janet.h', install_dir: get_option('includedir')) + install_symlink('janet.h', pointing_to: 'janet_' + meson.project_version() + '.h', install_dir: join_paths(get_option('includedir'), 'janet')) endif |