diff options
-rw-r--r-- | docs/docs/reference/Doxyfile.in | 2 | ||||
-rw-r--r-- | docs/docs/reference/meson.build | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/docs/reference/Doxyfile.in b/docs/docs/reference/Doxyfile.in index 8e9cb10..dbf55d8 100644 --- a/docs/docs/reference/Doxyfile.in +++ b/docs/docs/reference/Doxyfile.in @@ -296,12 +296,10 @@ GENERATE_TAGFILE = "reference/libsigc++-@SIGCXX_API_VERSION@.tag" ALLEXTERNALS = NO EXTERNAL_GROUPS = NO EXTERNAL_PAGES = YES -PERL_PATH = @PERL@ #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES -MSCGEN_PATH = DIA_PATH = HIDE_UNDOC_RELATIONS = NO HAVE_DOT = YES diff --git a/docs/docs/reference/meson.build b/docs/docs/reference/meson.build index 464214b..63d2ab8 100644 --- a/docs/docs/reference/meson.build +++ b/docs/docs/reference/meson.build @@ -1,7 +1,7 @@ # docs/docs/reference # Input: project_build_root, project_source_root, sigcxx_pcname, -# sigcxx_api_version, perl, build_documentation, source_h_files, +# sigcxx_api_version, build_documentation, source_h_files, # hg_ccg_basenames, install_datadir, python3, doc_reference # Output: install_docdir, install_devhelpdir, book_name @@ -24,10 +24,13 @@ foreach module : tag_file_modules htmlrefdir = htmlrefpub endif doxygen_tagfiles += ' "' + doxytagfile + '=' + htmlrefpub + '"' - if not htmlrefdir.endswith('/') - htmlrefdir += '/' - endif + + # Doxygen <= 1.8.15 docinstall_flags += ['-l', doxytagfile.split('/')[-1] + '@' + htmlrefdir] + if htmlrefpub != htmlrefdir + # Doxygen >= 1.8.16 + docinstall_flags += ['-l', 's@' + htmlrefpub + '@' + htmlrefdir] + endif endif endforeach @@ -44,7 +47,6 @@ doc_conf_data.set('abs_top_builddir', project_build_root) doc_conf_data.set('abs_top_srcdir', project_source_root) doc_conf_data.set('SIGCXX_API_VERSION', sigcxx_api_version) doc_conf_data.set('DOXYGEN_TAGFILES', doxygen_tagfiles) -doc_conf_data.set('PERL', perl.found() ? perl.path() : '') configure_file( input: 'Doxyfile.in', |