[pangomm/pangomm-2-42] docs/reference/: Update for Doxygen >= 1.8.16

[Kjell Ahlstedt <kjellahl src gnome org>]

commit d22c6843b2ed75ebea2166ee2ea08fa08ca74988
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon Jun 29 17:06:53 2020 +0200

    docs/reference/: Update for Doxygen >= 1.8.16
    
    * docs/reference/meson.build: Doxygen 1.8.16 and later does not store
    tag file names in the html files. This requires changes in meson.build
    and in doc-install.pl (in mm-common). Otherwise references to other modules
    won't be updated in the html files when they are installed.
    * docs/reference/Doxyfile.in: Remove PERL_PATH and MSCGEN_PATH.
    Doxygen since version 1.8.0 does not use them.

 docs/reference/Doxyfile.in |  2 --
 docs/reference/meson.build | 14 ++++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index 0274aab..dd6cfbf 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -305,12 +305,10 @@ GENERATE_TAGFILE       = "reference/@PANGOMM_MODULE_NAME@.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/reference/meson.build b/docs/reference/meson.build
index d0e25dc..f62bb5b 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,8 +1,8 @@
 # docs/reference
 
-# Input: built_files_root, project_source_root, pangomm_pcname, perl,
+# Input: built_files_root, project_source_root, pangomm_pcname, python3,
 #        hg_ccg_basenames, extra_h_files, built_h_file_targets, install_datadir,
-#        python3, doc_reference_py
+#        doc_reference_py
 # Output: install_docdir, install_devhelpdir
 
 tag_file_modules = [
@@ -25,10 +25,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
 
@@ -45,7 +48,6 @@ doc_conf_data.set('abs_top_builddir', built_files_root)
 doc_conf_data.set('abs_top_srcdir', project_source_root)
 doc_conf_data.set('PANGOMM_MODULE_NAME', book_name)
 doc_conf_data.set('DOXYGEN_TAGFILES', doxygen_tagfiles)
-doc_conf_data.set('PERL', perl.found() ? perl.path() : '')
 
 configure_file(
   input: 'Doxyfile.in',