mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-02-02 18:29:10 +00:00
Code Issues 1 Releases Wiki Activity

Fix bad merge.

Browse Source
This commit is contained in:
Calvin Rose 2023-09-27 22:34:46 -05:00
parent 964295b59d
commit b63d41102e
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -288,11 +288,7 @@ patched_janet = custom_target('patched-janeth',
install : true, install : true,
install_dir : join_paths(get_option('includedir'), 'janet'), install_dir : join_paths(get_option('includedir'), 'janet'),
build_by_default : true, build_by_default : true,
<<<<<<< HEAD
output : ['_janet.h'],
=======
output : ['janet_' + meson.project_version() + '.h'], output : ['janet_' + meson.project_version() + '.h'],
>>>>>>> @{-1}
command : [janet_nativeclient, '@INPUT@', '@OUTPUT@']) command : [janet_nativeclient, '@INPUT@', '@OUTPUT@'])
# Create a version of the janet.h header that matches what jpm often expects # Create a version of the janet.h header that matches what jpm often expects