From 579411b5c443ce4c6f45f30627bbf891a53c8f77 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 4 Jan 2023 23:14:10 +0100 Subject: [PATCH] meson: Fix installation path computation --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 8999170b4d..634dc7d167 100644 --- a/meson.build +++ b/meson.build @@ -467,19 +467,19 @@ dir_prefix = get_option('prefix') dir_bin = get_option('bindir') dir_data = get_option('datadir') -if not (dir_data.contains('pgsql') or dir_data.contains('postgres')) +if not ((dir_prefix/dir_data).contains('pgsql') or (dir_prefix/dir_data).contains('postgres')) dir_data = dir_data / pkg endif dir_sysconf = get_option('sysconfdir') -if not (dir_sysconf.contains('pgsql') or dir_sysconf.contains('postgres')) +if not ((dir_prefix/dir_sysconf).contains('pgsql') or (dir_prefix/dir_sysconf).contains('postgres')) dir_sysconf = dir_sysconf / pkg endif dir_lib = get_option('libdir') dir_lib_pkg = dir_lib -if not (dir_lib_pkg.contains('pgsql') or dir_lib_pkg.contains('postgres')) +if not ((dir_prefix/dir_lib_pkg).contains('pgsql') or (dir_prefix/dir_lib_pkg).contains('postgres')) dir_lib_pkg = dir_lib_pkg / pkg endif @@ -489,7 +489,7 @@ dir_include = get_option('includedir') dir_include_pkg = dir_include dir_include_pkg_rel = '' -if not (dir_include_pkg.contains('pgsql') or dir_include_pkg.contains('postgres')) +if not ((dir_prefix/dir_include_pkg).contains('pgsql') or (dir_prefix/dir_include_pkg).contains('postgres')) dir_include_pkg = dir_include_pkg / pkg dir_include_pkg_rel = pkg endif -- 2.39.0