1 diff -urNp -x '*.orig' postgresql-11.15.org/src/Makefile.global.in postgresql-11.15/src/Makefile.global.in
2 --- postgresql-11.15.org/src/Makefile.global.in 2022-02-07 22:20:23.000000000 +0100
3 +++ postgresql-11.15/src/Makefile.global.in 2022-04-04 18:21:30.352601767 +0200
4 @@ -120,7 +120,7 @@ libdir := @libdir@
6 ifeq "$(findstring pgsql, $(pkglibdir))" ""
7 ifeq "$(findstring postgres, $(pkglibdir))" ""
8 -override pkglibdir := $(pkglibdir)/postgresql
9 +override pkglibdir := $(pkglibdir)/postgresql/@PG_MAJORVERSION@/lib
13 @@ -168,7 +168,7 @@ endif # PGXS
15 # These derived path variables aren't separately configurable.
17 -includedir_server = $(pkgincludedir)/server
18 +includedir_server = $(pkgincludedir)/@PG_MAJORVERSION@/server
19 includedir_internal = $(pkgincludedir)/internal
20 pgxsdir = $(pkglibdir)/pgxs
21 bitcodedir = $(pkglibdir)/bitcode
22 diff -urNp -x '*.orig' postgresql-11.15.org/src/bin/pg_config/pg_config.c postgresql-11.15/src/bin/pg_config/pg_config.c
23 --- postgresql-11.15.org/src/bin/pg_config/pg_config.c 2022-02-07 22:20:23.000000000 +0100
24 +++ postgresql-11.15/src/bin/pg_config/pg_config.c 2022-04-04 18:21:30.352601767 +0200
27 #include "common/config_info.h"
29 +#include "../port/pg_config_paths.h"
31 static const char *progname;
34 @@ -148,11 +150,7 @@ main(int argc, char **argv)
38 - if (find_my_exec(argv[0], my_exec_path) < 0)
40 - fprintf(stderr, _("%s: could not find own program executable\n"), progname);
43 + snprintf(my_exec_path, sizeof(my_exec_path), "%s/%s", PGBINDIR, progname);
45 configdata = get_configdata(my_exec_path, &configdata_len);
46 /* no arguments -> print everything */