summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorLzu Tao <taolzu@gmail.com>2018-12-04 03:18:54 (GMT)
committerLzu Tao <taolzu@gmail.com>2018-12-04 03:18:54 (GMT)
commitfbc42958c087626edb24592a5ad1eb73bb6ae5cd (patch)
treecb24bdd8fba070783b91f0320a34f74c5c2c0bb9 /contrib
parent4c43d14891a286affbf2a5b4d57415451410048e (diff)
downloadlz4-fbc42958c087626edb24592a5ad1eb73bb6ae5cd.zip
lz4-fbc42958c087626edb24592a5ad1eb73bb6ae5cd.tar.gz
lz4-fbc42958c087626edb24592a5ad1eb73bb6ae5cd.tar.bz2
No need to join prefix and let soversion base on version
Diffstat (limited to 'contrib')
-rw-r--r--contrib/meson/lib/meson.build3
-rw-r--r--contrib/meson/meson.build8
2 files changed, 4 insertions, 7 deletions
diff --git a/contrib/meson/lib/meson.build b/contrib/meson/lib/meson.build
index f4b873e..ff7a703 100644
--- a/contrib/meson/lib/meson.build
+++ b/contrib/meson/lib/meson.build
@@ -32,8 +32,7 @@ liblz4 = library('lz4',
include_directories: liblz4_includes,
c_args: liblz4_c_args,
install: true,
- version: lz4_libversion,
- soversion: lz4_libsoversion)
+ version: lz4_libversion)
liblz4_dep = declare_dependency(link_with: liblz4,
include_directories: liblz4_includes)
diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build
index cbabbc6..d618eb4 100644
--- a/contrib/meson/meson.build
+++ b/contrib/meson/meson.build
@@ -46,18 +46,16 @@ else
message('Cannot find project version in @0@'.format(lz4_h_file))
endif
-lz4_version_array = lz4_version.split('.')
lz4_libversion = lz4_version
-lz4_libsoversion = lz4_version_array[0]
# =============================================================================
# Installation directories
# =============================================================================
lz4_prefix = get_option('prefix')
-lz4_bindir = join_paths(lz4_prefix, get_option('bindir'))
-lz4_datadir = join_paths(lz4_prefix, get_option('datadir'))
-lz4_mandir = join_paths(lz4_prefix, get_option('mandir'))
+lz4_bindir = get_option('bindir')
+lz4_datadir = get_option('datadir')
+lz4_mandir = get_option('mandir')
lz4_docdir = join_paths(lz4_datadir, 'doc', meson.project_name())
# =============================================================================