postgres.git / summary / log / commit / refs
commit 59dcc19b397f69a3654d39bae5a13f1659d922d8
Author: Robert Haas <rhaas@postgresql.org>
Date: Tue Mar 17 16:36:57 2026 +0000
pg_plan_advice: Always install pg_plan_advice.h, and in the right place
The Makefile failed to set HEADERS_pg_plan_advice, so the header wasn't
installed. Fixing that reveals another problem: since this is just a
loadable module, not an extension, the header file is installed into
$(includedir_server)/contrib rather than $(includedir_server)/extension.
While we have no existing cases of installing header files there, it
appears to be the intent of pgxs.mk. However, this is inconsistent with
meson.build, which was using dir_include_extension. Changing that to
dir_include_server / 'contrib' makes the install locations consistent
across the two builds.
Author: Zsolt Parragi <zsolt.parragi@percona.com>
Discussion: http://postgr.es/m/CAN4CZFP6NOjv__4Mx+iQD8StdpbHvzDAatEQn2n15UKJ=MySSQ@mail.gmail.com
contrib/pg_plan_advice/Makefile | 2 ++
contrib/pg_plan_advice/meson.build | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/pg_plan_advice/Makefile b/contrib/pg_plan_advice/Makefile
index d2a8233f387..cd478dc1a6d 100644
--- a/contrib/pg_plan_advice/Makefile
+++ b/contrib/pg_plan_advice/Makefile
@@ -15,6 +15,8 @@ OBJS = \
pgpa_trove.o \
pgpa_walker.o
+HEADERS_pg_plan_advice = pg_plan_advice.h
+
PGFILEDESC = "pg_plan_advice - help the planner get the right plan"
REGRESS = gather join_order join_strategy partitionwise prepared \
diff --git a/contrib/pg_plan_advice/meson.build b/contrib/pg_plan_advice/meson.build
index cf948ffaa13..36bbc4e9826 100644
--- a/contrib/pg_plan_advice/meson.build
+++ b/contrib/pg_plan_advice/meson.build
@@ -44,7 +44,7 @@ contrib_targets += pg_plan_advice
install_headers(
'pg_plan_advice.h',
- install_dir: dir_include_extension / 'pg_plan_advice',
+ install_dir: dir_include_server / 'contrib' / 'pg_plan_advice',
)
tests += {
[parent: 4b5ba0c4ca52]