diff options
| author |  Calvin Rose <calsrose@gmail.com> | 2023-09-27 22:34:46 -0500 |
|---|---|---|
| committer | Calvin Rose <calsrose@gmail.com> | 2023-09-27 22:34:46 -0500 |
| commit | b63d41102eef04d7698a4ad07769038aa88f50c4 (patch) | |
| tree | 625b3c91a70896274ef7c85cec2ec9cff8368f20 /meson.build | |
| parent | Merge branch 'net-reworkings' (diff) | |
Fix bad merge.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 7e8d8d56..fabe8cf0 100644 --- a/meson.build +++ b/meson.build @@ -288,11 +288,7 @@ 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 |