---- a/src/Makefile.global.in
-+++ b/src/Makefile.global.in
-@@ -120,7 +120,7 @@ libdir := @libdir@
- pkglibdir = $(libdir)
- ifeq "$(findstring pgsql, $(pkglibdir))" ""
- ifeq "$(findstring postgres, $(pkglibdir))" ""
--override pkglibdir := $(pkglibdir)/postgresql
-+override pkglibdir := $(pkglibdir)/postgresql/@PG_MAJORVERSION@/lib
- endif
- endif
-
-@@ -168,7 +168,7 @@ endif # PGXS
-
- # These derived path variables aren't separately configurable.
-
--includedir_server = $(pkgincludedir)/server
-+includedir_server = $(pkgincludedir)/@PG_MAJORVERSION@/server
- includedir_internal = $(pkgincludedir)/internal
- pgxsdir = $(pkglibdir)/pgxs
-
---- a/src/bin/pg_config/pg_config.c
-+++ b/src/bin/pg_config/pg_config.c
+diff -ur postgresql-14.0.orig/src/bin/pg_config/pg_config.c postgresql-14.0/src/bin/pg_config/pg_config.c
+--- postgresql-14.0.orig/src/bin/pg_config/pg_config.c 2021-11-01 14:48:22.654149731 +0100
++++ postgresql-14.0/src/bin/pg_config/pg_config.c 2021-11-01 14:49:14.747282545 +0100