Skip to content

Commit ed6cb5a

Browse files
peterepull[bot]
authored andcommitted
meson: Fix doc installation path computation
This applies the logic from 8f68580 (append "postgresql" to some installation paths if it does not already contain "pgsql" or "postgres") also to the doc installation directory. Reviewed-by: Tristan Partin <tristan@neon.tech> Reviewed-by: Andres Freund <andres@anarazel.de> Discussion: https://www.postgresql.org/message-id/b018b577-38a2-49c6-8727-adfb577de317@eisentraut.org
1 parent e69bd2d commit ed6cb5a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

meson.build

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,10 @@ endif
511511
dir_man = get_option('mandir')
512512

513513
# FIXME: These used to be separately configurable - worth adding?
514-
dir_doc = get_option('datadir') / 'doc' / 'postgresql'
514+
dir_doc = get_option('datadir') / 'doc'
515+
if not (dir_prefix_contains_pg or dir_doc.contains('pgsql') or dir_doc.contains('postgres'))
516+
dir_doc = dir_doc / pkg
517+
endif
515518
dir_doc_html = dir_doc / 'html'
516519

517520
dir_locale = get_option('localedir')

0 commit comments

Comments
 (0)