From f72d760b8746fc8b57c6641dd5a799d6a84e76d3 Mon Sep 17 00:00:00 2001 From: Zsolt Parragi Date: Sat, 14 Mar 2026 14:29:49 +0000 Subject: [PATCH] Fix pg_plan_advice header install discrepancy between make and meson The Makefile was missing header installation entirely, and the meson build was installing to extension/ despite pg_plan_advice not having a control file. Fix both: add HEADERS_pg_plan_advice to the Makefile, and change meson to install to contrib/ to match. --- 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 += { -- 2.43.0