git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

meson: Fix doc installation path computation

author Peter Eisentraut <peter@eisentraut.org>

Thu, 9 Nov 2023 14:05:58 +0000 (15:05 +0100)

committer Peter Eisentraut <peter@eisentraut.org>

Thu, 9 Nov 2023 14:10:43 +0000 (15:10 +0100)

This applies the logic from 8f6858064b (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

meson.build patch | blob | blame | history

diff --git a/meson.build b/meson.build

index 88a9d9051fe391c05a18a28cb6e48d4ea883524c..6c0faa9490f3d775cd1079bbde29d1b01d078e82 100644 (file)

--- a/meson.build

+++ b/meson.build

@@ -511,7 +511,10 @@ endif

dir_man = get_option('mandir')

# FIXME: These used to be separately configurable - worth adding?

-dir_doc = get_option('datadir') / 'doc' / 'postgresql'

+dir_doc = get_option('datadir') / 'doc'

+if not (dir_prefix_contains_pg or dir_doc.contains('pgsql') or dir_doc.contains('postgres'))

+ dir_doc = dir_doc / pkg

+endif

dir_doc_html = dir_doc / 'html'

dir_locale = get_option('localedir')

This is the main PostgreSQL git repository.

RSS Atom