@@ -54,15 +54,6 @@ ifeq ($(with_systemd),yes)
54
54
LIBS += -lsystemd
55
55
endif
56
56
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
-
66
57
# #########################################################################
67
58
68
59
all : submake-libpgport submake-catalog-headers submake-utils-headers postgres $(POSTGRES_IMP )
@@ -221,7 +212,12 @@ endif
221
212
$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
222
213
$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
223
214
$(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'
225
221
226
222
ifeq ($(with_llvm ) , yes)
227
223
install-bin : install-postgres-bitcode
@@ -247,7 +243,7 @@ endif
247
243
248
244
installdirs :
249
245
$(MKDIR_P ) ' $(DESTDIR)$(bindir)' ' $(DESTDIR)$(datadir)'
250
- $(MKDIR_P ) ' $(DESTDIR)$(datadir)' ' $(DESTDIR)$(datadir)/$(CRYPTO_SCRIPTDIR) '
246
+ $(MKDIR_P ) ' $(DESTDIR)$(datadir)' ' $(DESTDIR)$(datadir)/auth_commands '
251
247
ifeq ($(PORTNAME ) , cygwin)
252
248
ifeq ($(MAKE_DLL ) , true)
253
249
$(MKDIR_P) '$(DESTDIR)$(libdir)'
@@ -268,7 +264,6 @@ endif
268
264
269
265
uninstall :
270
266
rm -f ' $(DESTDIR)$(bindir)/postgres$(X)' ' $(DESTDIR)$(bindir)/postmaster'
271
- rm -f $(addprefix '$(DESTDIR )$(datadir ) /$(CRYPTO_SCRIPTDIR ) '/, $(CRYPTO_SCRIPTS ) )
272
267
ifeq ($(MAKE_EXPORTS ) , true)
273
268
rm -f '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
274
269
rm -f '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
@@ -288,7 +283,13 @@ endif
288
283
$(MAKE) -C utils uninstall-data
289
284
rm -f '$(DESTDIR)$(datadir)/pg_hba.conf.sample' \
290
285
'$(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'
292
293
ifeq ($(with_llvm ) , yes)
293
294
$(call uninstall_llvm_module,postgres)
294
295
endif
0 commit comments