diff --git a/contrib/pg_tde/.gitignore b/contrib/pg_tde/.gitignore index 044af8f3c5c..8dd13aa295c 100644 --- a/contrib/pg_tde/.gitignore +++ b/contrib/pg_tde/.gitignore @@ -11,7 +11,7 @@ __pycache__ /configure~ /log /results -/src/pg_tde_change_key_provider +/src/bin/pg_tde_change_key_provider /t/results /tmp_check diff --git a/contrib/pg_tde/Makefile b/contrib/pg_tde/Makefile index dd9f5541c6d..c78599fe478 100644 --- a/contrib/pg_tde/Makefile +++ b/contrib/pg_tde/Makefile @@ -51,10 +51,10 @@ src/libkmip/libkmip/src/kmip_bio.o \ src/libkmip/libkmip/src/kmip_locate.o \ src/libkmip/libkmip/src/kmip_memset.o -SCRIPTS_built = src/pg_tde_change_key_provider +SCRIPTS_built = src/bin/pg_tde_change_key_provider EXTRA_INSTALL += contrib/pg_buffercache contrib/test_decoding -EXTRA_CLEAN += src/pg_tde_change_key_provider.o +EXTRA_CLEAN += src/bin/pg_tde_change_key_provider.o ifdef USE_PGXS PG_CONFIG = pg_config @@ -71,7 +71,7 @@ endif override SHLIB_LINK += -lcurl -lcrypto -lssl -src/pg_tde_change_key_provider: src/pg_tde_change_key_provider.o $(top_srcdir)/src/fe_utils/simple_list.o $(top_builddir)/src/libtde/libtde.a +src/bin/pg_tde_change_key_provider: src/bin/pg_tde_change_key_provider.o $(top_srcdir)/src/fe_utils/simple_list.o $(top_builddir)/src/libtde/libtde.a $(CC) -DFRONTEND $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) # Fetches typedefs list for PostgreSQL core and merges it with typedefs defined in this project. diff --git a/contrib/pg_tde/meson.build b/contrib/pg_tde/meson.build index 42a6bbe6aff..df05c36dffd 100644 --- a/contrib/pg_tde/meson.build +++ b/contrib/pg_tde/meson.build @@ -151,7 +151,7 @@ pg_tde_frontend = static_library('pg_tde_frontend', ) pg_tde_change_key_provider_sources = files( - 'src/pg_tde_change_key_provider.c', + 'src/bin/pg_tde_change_key_provider.c', ) pg_tde_change_key_provider = executable('pg_tde_change_key_provider', diff --git a/contrib/pg_tde/src/pg_tde_change_key_provider.c b/contrib/pg_tde/src/bin/pg_tde_change_key_provider.c similarity index 100% rename from contrib/pg_tde/src/pg_tde_change_key_provider.c rename to contrib/pg_tde/src/bin/pg_tde_change_key_provider.c