Subprojects can use meson.add_dist_script() if meson.version() >= 0.58.0

* meson.build:
* skeletonmm/doc/reference/meson.build:
* skeletonmm/meson.build:
* skeletonmm/skeleton/skeletonmm/meson.build:
Call add_dist_script() in a subproject, if meson.version() >= 0.58.0.
* util/build_scripts/dist-build-scripts.py:
* util/build_scripts/dist-changelog.py:
* util/build_scripts/doc-reference.py:
* util/build_scripts/generate-binding.py:
* util/meson_aux/extra-dist-cmd.py:
Use MESON_PROJECT_DIST_ROOT if it exists, else MESON_DIST_ROOT.
It exists if meson.version() >= 0.58.0.

1 files changed, 5 insertions, 2 deletions

diff --git a/util/build_scripts/doc-reference.py b/util/build_scripts/doc-reference.py
index c9a3a80..9769688 100755
--- a/util/build_scripts/doc-reference.py
+++ b/util/build_scripts/doc-reference.py
@@ -142,10 +142,13 @@ def dist_doc():
   #      argv[3]              argv[4]       argv[5]     argv[6]
   # <doctool_dist_dir> <doc_ref_build_dir> <tagfile> <devhelpfile>
 
-  # <doctool_dist_dir> is a distribution directory, relative to MESON_DIST_ROOT.
+  # <doctool_dist_dir> is a distribution directory, relative to MESON_PROJECT_DIST_ROOT.
   # <doc_ref_build_dir> is a relative or absolute path in the build directory.
   # <tagfile> and <devhelpfile> are relative or absolute paths in the build directory.
-  doctool_dist_dir = os.path.join(os.getenv('MESON_DIST_ROOT'), sys.argv[3])
+
+  # MESON_PROJECT_DIST_ROOT is set only if meson.version() >= 0.58.0.
+  project_dist_root = os.getenv('MESON_PROJECT_DIST_ROOT', os.getenv('MESON_DIST_ROOT'))
+  doctool_dist_dir = os.path.join(project_dist_root, sys.argv[3])
   doc_ref_build_dir = sys.argv[4]
   tagfile = sys.argv[5]
   devhelpfile = sys.argv[6]