Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8f68580

Browse files
committed
meson: Fix installation path computation
We have the long-standing logic to append "postgresql" to someinstallation paths if it does not already contain "pgsql" or"postgres". The existing meson implementation of that only consideredthe subdirectory under the prefix, not the prefix itself. Fix that,so that it now works the same way as the implementation inMakefile.global.Reviewed-by: Andres Freund <andres@anarazel.de>Discussion:https://www.postgresql.org/message-id/a6a6de12-f705-2b33-2fd9-9743277deb08@enterprisedb.com
1 parent17e72ec commit8f68580

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

‎meson.build

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,22 +465,24 @@ pkg = 'postgresql'
465465

466466
dir_prefix=get_option('prefix')
467467

468+
dir_prefix_contains_pg= (dir_prefix.contains('pgsql')or dir_prefix.contains('postgres'))
469+
468470
dir_bin=get_option('bindir')
469471

470472
dir_data=get_option('datadir')
471-
ifnot (dir_data.contains('pgsql')or dir_data.contains('postgres'))
473+
ifnot (dir_prefix_contains_pgordir_data.contains('pgsql')or dir_data.contains('postgres'))
472474
dir_data= dir_data/ pkg
473475
endif
474476

475477
dir_sysconf=get_option('sysconfdir')
476-
ifnot (dir_sysconf.contains('pgsql')or dir_sysconf.contains('postgres'))
478+
ifnot (dir_prefix_contains_pgordir_sysconf.contains('pgsql')or dir_sysconf.contains('postgres'))
477479
dir_sysconf= dir_sysconf/ pkg
478480
endif
479481

480482
dir_lib=get_option('libdir')
481483

482484
dir_lib_pkg= dir_lib
483-
ifnot (dir_lib_pkg.contains('pgsql')or dir_lib_pkg.contains('postgres'))
485+
ifnot (dir_prefix_contains_pgordir_lib_pkg.contains('pgsql')or dir_lib_pkg.contains('postgres'))
484486
dir_lib_pkg= dir_lib_pkg/ pkg
485487
endif
486488

@@ -490,7 +492,7 @@ dir_include = get_option('includedir')
490492

491493
dir_include_pkg= dir_include
492494
dir_include_pkg_rel=''
493-
ifnot (dir_include_pkg.contains('pgsql')or dir_include_pkg.contains('postgres'))
495+
ifnot (dir_prefix_contains_pgordir_include_pkg.contains('pgsql')or dir_include_pkg.contains('postgres'))
494496
dir_include_pkg= dir_include_pkg/ pkg
495497
dir_include_pkg_rel= pkg
496498
endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp