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

diff --git a/contrib/pg_plan_advice/Makefile b/contrib/pg_plan_advice/Makefile
index d2a8233f38748d9bedcbafd69897dcb0de9fa18c..cd478dc1a6d7c90d4f3f8351fc549fdc4e9fabb4 100644 (file)
--- 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 cf948ffaa137dc210c207f2336c887637be45866..36bbc4e98265efec43ac540b0db1f85f4f62e597 100644 (file)
--- 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 += {