From 9405aaa1dbd7b61733dec7cca4f657637c2d37c0 Mon Sep 17 00:00:00 2001
From: Zsolt Parragi <zsolt.parragi@cancellar.hu>
Date: Mon, 5 Aug 2024 19:51:11 +0100
Subject: [PATCH] Updated CI runners

---
 .github/workflows/postgresql-16-pgdg-package-pgxs.yml | 2 +-
 .github/workflows/postgresql-16-src-make-macos.yml    | 2 +-
 .github/workflows/postgresql-16-src-make-ssl11.yml    | 2 +-
 .github/workflows/postgresql-16-src-make.yml          | 2 +-
 Makefile.in                                           | 4 ++--
 docker/Dockerfile                                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/postgresql-16-pgdg-package-pgxs.yml b/.github/workflows/postgresql-16-pgdg-package-pgxs.yml
index 2a9bc8f2..3439f1b2 100644
--- a/.github/workflows/postgresql-16-pgdg-package-pgxs.yml
+++ b/.github/workflows/postgresql-16-pgdg-package-pgxs.yml
@@ -56,7 +56,7 @@ jobs:
         run: |
           sudo -u postgres bash -c './configure'
           sudo -u postgres bash -c 'make USE_PGXS=1'
-          sudo make USE_PGXS=1 install
+          sudo make USE_PGXS=1 MAJORVERSION=16 install
         working-directory: src/pg_tde
 
       - name: Start pg_tde tests
diff --git a/.github/workflows/postgresql-16-src-make-macos.yml b/.github/workflows/postgresql-16-src-make-macos.yml
index d20ee7e5..bc6179de 100644
--- a/.github/workflows/postgresql-16-src-make-macos.yml
+++ b/.github/workflows/postgresql-16-src-make-macos.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Build pg_tde
         run: |
           ./configure
-          make -j
+          make -j MAJORVERSION=16
           sudo make install
         working-directory: src/contrib/pg_tde
 
diff --git a/.github/workflows/postgresql-16-src-make-ssl11.yml b/.github/workflows/postgresql-16-src-make-ssl11.yml
index 06ede237..2b7f4a5d 100644
--- a/.github/workflows/postgresql-16-src-make-ssl11.yml
+++ b/.github/workflows/postgresql-16-src-make-ssl11.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Build pg_tde
         run: |
           ./configure
-          make -j
+          make -j MAJORVERSION=16
           sudo make install
         working-directory: src/contrib/pg_tde
 
diff --git a/.github/workflows/postgresql-16-src-make.yml b/.github/workflows/postgresql-16-src-make.yml
index 0499caf9..668523d6 100644
--- a/.github/workflows/postgresql-16-src-make.yml
+++ b/.github/workflows/postgresql-16-src-make.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Build pg_tde
         run: |
           ./configure
-          make -j
+          make -j MAJORVERSION=16
           sudo make install
         working-directory: src/contrib/pg_tde
 
diff --git a/Makefile.in b/Makefile.in
index 2ac378cb..6c79023e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,12 +57,12 @@ override PG_CPPFLAGS += @tde_CPPFLAGS@
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
-override PG_CPPFLAGS += -I$(CURDIR)/src/include
+override PG_CPPFLAGS += -I$(CURDIR)/src/include -I$(CURDIR)/src$(MAJORVERSION)/include
 include $(PGXS)
 else
 subdir = contrib/pg_tde
 top_builddir = ../..
-override PG_CPPFLAGS += -I$(top_srcdir)/$(subdir)/src/include
+override PG_CPPFLAGS += -I$(top_srcdir)/$(subdir)/src/include -I$(top_srcdir)/$(subdir)/src$(MAJORVERSION)/include
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c8b46154..516f5987 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,7 @@ WORKDIR /opt/pg_tde
 COPY . .
 
 RUN ./configure && \
-    make USE_PGXS=1 && \
+    make USE_PGXS=1 MAJORVERSION=16 && \
     make USE_PGXS=1 install
 RUN cp /usr/share/postgresql/postgresql.conf.sample /etc/postgresql/postgresql.conf; \
     echo "shared_preload_libraries = 'pg_tde'" >> /etc/postgresql/postgresql.conf; \