From fbc42958c087626edb24592a5ad1eb73bb6ae5cd Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Tue, 4 Dec 2018 10:18:54 +0700 Subject: No need to join prefix and let soversion base on version --- contrib/meson/lib/meson.build | 3 +-- contrib/meson/meson.build | 8 +++----- 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()) # ============================================================================= -- cgit v0.12