From 26de04d147a818877c3229dfcf9094cbd932e007 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sun, 26 Jun 2022 19:57:41 +0200 Subject: [PATCH] Meson: avoid using deprecated feature (#2895) --- configure.ac | 2 +- cplusplus/meson.build | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 42bfebf6..5ca58196 100644 --- a/configure.ac +++ b/configure.ac @@ -229,7 +229,7 @@ VIPS_EXEEXT=$EXEEXT AC_SUBST(VIPS_EXEEXT) # cplusplus/Doxyfile.in needs an input and output directory ... they are the -# same for copnfigure, but meson has separate source and build areas +# same for configure, but meson has separate source and build areas DOXY_INPUT_DIRECTORY=$ac_pwd/$srcdir/cplusplus DOXY_OUTPUT_DIRECTORY=$ac_pwd/$srcdir/cplusplus AC_SUBST(DOXY_INPUT_DIRECTORY) diff --git a/cplusplus/meson.build b/cplusplus/meson.build index f00e58ab..a47ad6cc 100644 --- a/cplusplus/meson.build +++ b/cplusplus/meson.build @@ -44,8 +44,7 @@ if get_option('doxygen') doxygen_data = configuration_data() doxygen_data.set('VIPS_MAJOR_VERSION', version_major) doxygen_data.set('VIPS_MINOR_VERSION', version_minor) - doxygen_data.set('DOXY_INPUT_DIRECTORY', - join_paths(meson.source_root(), meson.current_source_dir())) + doxygen_data.set('DOXY_INPUT_DIRECTORY', meson.current_source_dir()) doxygen_data.set('DOXY_OUTPUT_DIRECTORY', 'cplusplus') doxyfile = configure_file(