diff options
| -rw-r--r-- | meson.build | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 45fb9dd616e..e379a252a51 100644 --- a/meson.build +++ b/meson.build @@ -465,22 +465,24 @@ pkg = 'postgresql' dir_prefix = get_option('prefix') +dir_prefix_contains_pg = (dir_prefix.contains('pgsql') or dir_prefix.contains('postgres')) + 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_contains_pg or dir_data.contains('pgsql') or 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_contains_pg or dir_sysconf.contains('pgsql') or 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_contains_pg or dir_lib_pkg.contains('pgsql') or dir_lib_pkg.contains('postgres')) dir_lib_pkg = dir_lib_pkg / pkg endif @@ -490,7 +492,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_contains_pg or dir_include_pkg.contains('pgsql') or dir_include_pkg.contains('postgres')) dir_include_pkg = dir_include_pkg / pkg dir_include_pkg_rel = pkg endif |