From 395ca7feea248695ed30dd7a977331c5fb708dc4 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sat, 14 May 2022 10:26:46 -0500 Subject: [PATCH] Fix meson.build for older versions of meson. --- meson.build | 7 +++++-- src/conf/janetconf.h | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index b28f33ca..2857b444 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ project('janet', 'c', default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'], - version : '1.22.0') + version : '1.22.1') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') @@ -265,4 +265,7 @@ patched_janet = custom_target('patched-janeth', command : [janet_nativeclient, '@INPUT@', '@OUTPUT@']) # Create a version of the janet.h header that matches what jpm often expects -install_symlink('janet.h', pointing_to: 'janet/janet.h', install_dir: get_option('includedir')) +if meson.version().version_compare('>=0.61') + install_symlink('janet.h', pointing_to: 'janet/janet.h', install_dir: get_option('includedir')) +endif + diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h index 6a651ae3..3bd49527 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -5,9 +5,9 @@ #define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MINOR 22 -#define JANET_VERSION_PATCH 0 -#define JANET_VERSION_EXTRA "" -#define JANET_VERSION "1.22.0" +#define JANET_VERSION_PATCH 1 +#define JANET_VERSION_EXTRA "-dev" +#define JANET_VERSION "1.22.1-dev" /* #define JANET_BUILD "local" */