@@ -54,15 +54,6 @@ ifeq ($(with_systemd),yes)
5454LIBS += -lsystemd
5555endif
5656
57- CRYPTO_SCRIPTDIR =auth_commands
58- CRYPTO_SCRIPTS = \
59- ckey_aws.sh.sample \
60- ckey_direct.sh.sample \
61- ckey_passphrase.sh.sample \
62- ckey_piv_nopin.sh.sample \
63- ckey_piv_pin.sh.sample \
64- ssl_passphrase.sh.sample
65-
6657# #########################################################################
6758
6859all : submake-libpgport submake-catalog-headers submake-utils-headers postgres $(POSTGRES_IMP )
@@ -221,7 +212,12 @@ endif
221212 $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
222213 $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
223214 $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
224- $(INSTALL_DATA) $(addprefix 'crypto/', $(CRYPTO_SCRIPTS)) '$(DESTDIR)$(datadir)/$(CRYPTO_SCRIPTDIR)'
215+ $(INSTALL_DATA) $(srcdir)/crypto/ckey_aws.sh.sample '$(DESTDIR)$(datadir)/auth_commands/ckey_aws.sh.sample'
216+ $(INSTALL_DATA) $(srcdir)/crypto/ckey_direct.sh.sample '$(DESTDIR)$(datadir)/auth_commands/ckey_direct.sh.sample'
217+ $(INSTALL_DATA) $(srcdir)/crypto/ckey_passphrase.sh.sample '$(DESTDIR)$(datadir)/auth_commands/ckey_passphrase.sh.sample'
218+ $(INSTALL_DATA) $(srcdir)/crypto/ckey_piv_nopin.sh.sample '$(DESTDIR)$(datadir)/auth_commands/ckey_piv_nopin.sh.sample'
219+ $(INSTALL_DATA) $(srcdir)/crypto/ckey_piv_pin.sh.sample '$(DESTDIR)$(datadir)/auth_commands/ckey_piv_pin.sh.sample'
220+ $(INSTALL_DATA) $(srcdir)/crypto/ssl_passphrase.sh.sample '$(DESTDIR)$(datadir)/auth_commands/ssl_passphrase.sh.sample'
225221
226222ifeq ($(with_llvm ) , yes)
227223install-bin : install-postgres-bitcode
@@ -247,7 +243,7 @@ endif
247243
248244installdirs :
249245 $(MKDIR_P ) ' $(DESTDIR)$(bindir)' ' $(DESTDIR)$(datadir)'
250- $(MKDIR_P ) ' $(DESTDIR)$(datadir)' ' $(DESTDIR)$(datadir)/$(CRYPTO_SCRIPTDIR) '
246+ $(MKDIR_P ) ' $(DESTDIR)$(datadir)' ' $(DESTDIR)$(datadir)/auth_commands '
251247ifeq ($(PORTNAME ) , cygwin)
252248ifeq ($(MAKE_DLL ) , true)
253249 $(MKDIR_P) '$(DESTDIR)$(libdir)'
@@ -268,7 +264,6 @@ endif
268264
269265uninstall :
270266 rm -f ' $(DESTDIR)$(bindir)/postgres$(X)' ' $(DESTDIR)$(bindir)/postmaster'
271- rm -f $(addprefix '$(DESTDIR )$(datadir ) /$(CRYPTO_SCRIPTDIR ) '/, $(CRYPTO_SCRIPTS ) )
272267ifeq ($(MAKE_EXPORTS ) , true)
273268 rm -f '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
274269 rm -f '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
@@ -288,7 +283,13 @@ endif
288283 $(MAKE) -C utils uninstall-data
289284 rm -f '$(DESTDIR)$(datadir)/pg_hba.conf.sample' \
290285 '$(DESTDIR)$(datadir)/pg_ident.conf.sample' \
291- '$(DESTDIR)$(datadir)/postgresql.conf.sample'
286+ '$(DESTDIR)$(datadir)/postgresql.conf.sample' \
287+ '$(DESTDIR)$(datadir)/auth_commands/ckey_aws.sh.sample' \
288+ '$(DESTDIR)$(datadir)/auth_commands/ckey_direct.sh.sample' \
289+ '$(DESTDIR)$(datadir)/auth_commands/ckey_passphrase.sh.sample' \
290+ '$(DESTDIR)$(datadir)/auth_commands/ckey_piv_nopin.sh.sample' \
291+ '$(DESTDIR)$(datadir)/auth_commands/ckey_piv_pin.sh.sample' \
292+ '$(DESTDIR)$(datadir)/auth_commands/ssl_passphrase.sh.sample'
292293ifeq ($(with_llvm ) , yes)
293294 $(call uninstall_llvm_module,postgres)
294295endif
0 commit comments