diff options
| author | Peter Eisentraut | 2023-01-27 09:49:17 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2023-01-27 10:57:11 +0000 |
| commit | 8f6858064b1442f9ad057d289b0e4f018a2ad8aa (patch) | |
| tree | 22a5fe667166945520d795fc9c6942761d440fc4 | |
| parent | 17e72ec45d313b98bd90b95bc71b4cc77c2c89c3 (diff) | |
meson: Fix installation path computation
We have the long-standing logic to append "postgresql" to some
installation paths if it does not already contain "pgsql" or
"postgres". The existing meson implementation of that only considered
the subdirectory under the prefix, not the prefix itself. Fix that,
so that it now works the same way as the implementation in
Makefile.global.
Reviewed-by: Andres Freund <andres@anarazel.de>
Discussion: https://www.postgresql.org/message-id/a6a6de12-f705-2b33-2fd9-9743277deb08@enterprisedb.com
| -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 |