Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitba6725d

Browse files
committed
auth commands: list specific commands to install in Makefile
Previously I used Makefile functions.Backpatch-through: master
1 parente174a6f commitba6725d

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

‎src/backend/Makefile

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,6 @@ ifeq ($(with_systemd),yes)
5454
LIBS += -lsystemd
5555
endif
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

6859
all: 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

226222
ifeq ($(with_llvm), yes)
227223
install-bin: install-postgres-bitcode
@@ -247,7 +243,7 @@ endif
247243

248244
installdirs:
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'
251247
ifeq ($(PORTNAME), cygwin)
252248
ifeq ($(MAKE_DLL), true)
253249
$(MKDIR_P) '$(DESTDIR)$(libdir)'
@@ -268,7 +264,6 @@ endif
268264

269265
uninstall:
270266
rm -f'$(DESTDIR)$(bindir)/postgres$(X)''$(DESTDIR)$(bindir)/postmaster'
271-
rm -f$(addprefix '$(DESTDIR)$(datadir)/$(CRYPTO_SCRIPTDIR)'/,$(CRYPTO_SCRIPTS))
272267
ifeq ($(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'
292293
ifeq ($(with_llvm), yes)
293294
$(call uninstall_llvm_module,postgres)
294295
endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp