From a41e3ff1594fb2df50927f3913e190edfcf02cc0 Mon Sep 17 00:00:00 2001
From: "David E. Wheeler" <david.wheeler@tembo.io>
Date: Fri, 13 Dec 2024 16:54:48 -0500
Subject: [PATCH] Fix configure and install errors

Configure postgres for extensions that need it, properly install
vectorize, and change into the correct directory to install emaj.
---
 contrib/earthdistance/Dockerfile  | 1 +
 contrib/emaj/Trunk.toml           | 2 +-
 contrib/hstore/Dockerfile         | 1 +
 contrib/hstore_plperl/Dockerfile  | 1 +
 contrib/hstore_plperlu/Dockerfile | 1 +
 contrib/vectorscale/Trunk.toml    | 6 +-----
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/earthdistance/Dockerfile b/contrib/earthdistance/Dockerfile
index e07ddab9..ebdf0f69 100644
--- a/contrib/earthdistance/Dockerfile
+++ b/contrib/earthdistance/Dockerfile
@@ -19,4 +19,5 @@ RUN apt-get update && apt-get install -y \
 ARG EXTENSION_NAME
 ARG PG_RELEASE
 RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \
+	&& (cd postgres && ./configure --with-perl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \
 	&& make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1
diff --git a/contrib/emaj/Trunk.toml b/contrib/emaj/Trunk.toml
index 1e58e7c3..6a91d613 100644
--- a/contrib/emaj/Trunk.toml
+++ b/contrib/emaj/Trunk.toml
@@ -14,4 +14,4 @@ apt = ["libstdc++6", "libgcc-s1", "libc6"]
 postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = "cd emaj-4.5.0 && make install"
+install_command = "cd e-maj-4.5.0 && make install"
diff --git a/contrib/hstore/Dockerfile b/contrib/hstore/Dockerfile
index e07ddab9..ebdf0f69 100644
--- a/contrib/hstore/Dockerfile
+++ b/contrib/hstore/Dockerfile
@@ -19,4 +19,5 @@ RUN apt-get update && apt-get install -y \
 ARG EXTENSION_NAME
 ARG PG_RELEASE
 RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \
+	&& (cd postgres && ./configure --with-perl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \
 	&& make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1
diff --git a/contrib/hstore_plperl/Dockerfile b/contrib/hstore_plperl/Dockerfile
index 48710968..553ec341 100644
--- a/contrib/hstore_plperl/Dockerfile
+++ b/contrib/hstore_plperl/Dockerfile
@@ -21,4 +21,5 @@ RUN apt-get update && apt-get install -y \
 ARG EXTENSION_NAME
 ARG PG_RELEASE
 RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \
+	&& (cd postgres && ./configure --with-perl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \
 	&& make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1
diff --git a/contrib/hstore_plperlu/Dockerfile b/contrib/hstore_plperlu/Dockerfile
index 658fedb0..a5bdbd54 100644
--- a/contrib/hstore_plperlu/Dockerfile
+++ b/contrib/hstore_plperlu/Dockerfile
@@ -21,4 +21,5 @@ RUN apt-get update && apt-get install -y \
 # ARG EXTENSION_NAME
 ARG PG_RELEASE
 RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \
+	&& (cd postgres && ./configure --with-perl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \
 	&& make -C postgres/contrib/hstore_plperl USE_PGXS=1
diff --git a/contrib/vectorscale/Trunk.toml b/contrib/vectorscale/Trunk.toml
index 5f6cb919..a6802f6b 100644
--- a/contrib/vectorscale/Trunk.toml
+++ b/contrib/vectorscale/Trunk.toml
@@ -15,8 +15,4 @@ apt = ["libc6"]
 postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pgvectorscale/pgvectorscale
-    mv target/release/vectorscale-pg17/usr/lib/postgresql/15/lib/* /usr/lib/postgresql/15/lib
-    mv target/release/vectorscale-pg17/usr/share/postgresql/15/extension/* /usr/share/postgresql/15/extension
-"""
+install_command = "cd pgvectorscale/pgvectorscale cargo pgrx install --release"