Minor fix for meson build

Use files function instead of constructing path with meson.current_source_dir()

diff --git a/contrib/meson/contrib/gen_html/meson.build b/contrib/meson/contrib/gen_html/meson.build
index 086b8f058894bc8085db82615015a415cb786eff..38ed52761c62e52f8318deb92cbda7e68c869036 100644 (file)
--- a/contrib/meson/contrib/gen_html/meson.build
+++ b/contrib/meson/contrib/gen_html/meson.build
@@ -16,7 +16,7 @@ contrib_gen_html_dir = join_paths(zstd_source_dir, 'contrib', 'gen_html')
 gen_html_includes = include_directories(programs_dir,
     library_dir,
     library_common_dir,
-    contrib_gen_html_dir )
+    contrib_gen_html_dir)
 
 gen_html = executable('gen_html',
     join_paths(contrib_gen_html_dir, 'gen_html.cpp'),

diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build
index b9ac88281c90d957915c3c027edfec11bfb557d9..48f8d570d84441236a5a66087a3b155a53d6b2ce 100644 (file)
--- a/contrib/meson/meson.build
+++ b/contrib/meson/meson.build
@@ -52,10 +52,17 @@ enable_zlib = get_option('zlib_support')
 enable_lzma = get_option('lzma_support')
 
 # =============================================================================
-# Getting project version from zstd.h
+# Helper scripts for Meson
 # =============================================================================
 
 GetZstdLibraryVersion_py = files('GetZstdLibraryVersion.py')
+CreateSymlink_py = files('CreateSymlink.py')
+CopyFile_py = files('CopyFile.py')
+
+# =============================================================================
+# Getting project version from zstd.h
+# =============================================================================
+
 zstd_h_file = join_paths(library_dir, 'zstd.h')
 r = run_command(python3, GetZstdLibraryVersion_py, zstd_h_file)
 if r.returncode() == 0

diff --git a/contrib/meson/meson_options.txt b/contrib/meson/meson_options.txt
index 1d28c71a8d1fa941dd9639e28a19de1ecc1316e8..6e9358576a0d816c8edab7fd6f137ad3d293269a 100644 (file)
--- a/contrib/meson/meson_options.txt
+++ b/contrib/meson/meson_options.txt
@@ -9,7 +9,7 @@
 # #############################################################################
 
 option('multithread_support', type: 'boolean', value: true,
-    description: 'Enable multithreading when pthread is detected')
+    description: 'Enable multi-threading when pthread is detected')
 option('legacy_support', type: 'string', value: '4',
     description: 'Support any legacy format: true or false, or 7 to 1 for v0.7+ to v0.1+')
 option('build_programs', type: 'boolean', value: true,

diff --git a/contrib/meson/programs/meson.build b/contrib/meson/programs/meson.build
index 63ea328ae345f1114564d0dbe2984d7c5068208e..8130ab1520afa01b64de025d2225bfd64c9cd0de 100644 (file)
--- a/contrib/meson/programs/meson.build
+++ b/contrib/meson/programs/meson.build
@@ -61,8 +61,6 @@ executable('zstd-frugal',
 # Program symlinks
 # =============================================================================
 
-CreateSymlink_py = join_paths(meson.current_source_dir(), '..', 'CreateSymlink.py')
-
 foreach f : [ 'zstdcat', 'unzstd' ]
     custom_target(f,
         output : f,
@@ -89,7 +87,6 @@ endif
 
 zstd_man1_dir = join_paths(zstd_mandir, 'man1')
 zstd_1_file = join_paths(programs_dir, 'zstd.1')
-CopyFile_py = join_paths(meson.current_source_dir(), '..', 'CopyFile.py')
 
 custom_target('zstd.1',
         output : 'zstd.1',