Commit15ced72

petere

authored and

pull[bot]

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 parent3db842c commit15ced72Copy full SHA for 15ced72

File tree

1 file changed

-4

lines changed

meson.build

1 file changed

-4

lines changed

`‎meson.build`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -465,22 +465,24 @@ pkg = 'postgresql'`
`465`	`465`
`466`	`466`	`dir_prefix=get_option('prefix')`
`467`	`467`
	`468`	`+dir_prefix_contains_pg= (dir_prefix.contains('pgsql')or dir_prefix.contains('postgres'))`
	`469`	`+`
`468`	`470`	`dir_bin=get_option('bindir')`
`469`	`471`
`470`	`472`	`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'))`
`472`	`474`	`dir_data= dir_data/ pkg`
`473`	`475`	`endif`
`474`	`476`
`475`	`477`	`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'))`
`477`	`479`	`dir_sysconf= dir_sysconf/ pkg`
`478`	`480`	`endif`
`479`	`481`
`480`	`482`	`dir_lib=get_option('libdir')`
`481`	`483`
`482`	`484`	`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'))`
`484`	`486`	`dir_lib_pkg= dir_lib_pkg/ pkg`
`485`	`487`	`endif`
`486`	`488`
`@@ -490,7 +492,7 @@ dir_include = get_option('includedir')`
`490`	`492`
`491`	`493`	`dir_include_pkg= dir_include`
`492`	`494`	`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'))`
`494`	`496`	`dir_include_pkg= dir_include_pkg/ pkg`
`495`	`497`	`dir_include_pkg_rel= pkg`
`496`	`498`	`endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit15ced72

File tree

1 file changed

1 file changed

`‎meson.build`

0 commit comments