per-version-dirs.patch

   1 diff -urNp -x '*.orig' postgresql-13.6.org/src/Makefile.global.in postgresql-13.6/src/Makefile.global.in
   2 --- postgresql-13.6.org/src/Makefile.global.in  2022-02-07 22:17:41.000000000 +0100
   3 +++ postgresql-13.6/src/Makefile.global.in      2022-04-04 17:54:23.042839497 +0200
   4 @@ -119,7 +119,7 @@ libdir := @libdir@
   5  pkglibdir = $(libdir)
   6  ifeq "$(findstring pgsql, $(pkglibdir))" ""
   7  ifeq "$(findstring postgres, $(pkglibdir))" ""
   8 -override pkglibdir := $(pkglibdir)/postgresql
   9 +override pkglibdir := $(pkglibdir)/postgresql/@PG_MAJORVERSION@/lib
  10  endif
  11  endif
  12
  13 @@ -167,7 +167,7 @@ endif # PGXS
  14
  15  # These derived path variables aren't separately configurable.
  16
  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-13.6.org/src/bin/pg_config/pg_config.c postgresql-13.6/src/bin/pg_config/pg_config.c
  23 --- postgresql-13.6.org/src/bin/pg_config/pg_config.c   2022-02-07 22:17:41.000000000 +0100
  24 +++ postgresql-13.6/src/bin/pg_config/pg_config.c       2022-04-04 17:54:23.042839497 +0200
  25 @@ -27,6 +27,8 @@
  26  #include "common/config_info.h"
  27  #include "port.h"
  28
  29 +#include "../port/pg_config_paths.h"
  30 +
  31  static const char *progname;
  32
  33  /*
  34 @@ -149,11 +151,7 @@ main(int argc, char **argv)
  35                 }
  36         }
  37
  38 -       if (find_my_exec(argv[0], my_exec_path) < 0)
  39 -       {
  40 -               fprintf(stderr, _("%s: could not find own program executable\n"), progname);
  41 -               exit(1);
  42 -       }
  43 +       snprintf(my_exec_path, sizeof(my_exec_path), "%s/%s", PGBINDIR, progname);
  44
  45         configdata = get_configdata(my_exec_path, &configdata_len);
  46         /* no arguments -> print everything */