Skip to content

Commit 00b7854

Browse files
committed
buildsystem: add bin/Makefile.inc
* Makefile.am (setup, setup_in): Move to bin/Makefile.inc. * postgresql-setup.in: Moved under bin/ unchanged. * doc/Makefile.inc: Reflect that built postgresql-setup is under bin/ subdir. * src/Makefile.inc: New file.
1 parent 41bad2e commit 00b7854

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

Makefile.am

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
setup = $(NAME_BINARYBASE)-setup
2-
setup_in = postgresql-setup.in
3-
41
ctl = $(NAME_BINARYBASE)-ctl
52
ctl_in = postgresql-ctl.in
63

@@ -42,7 +39,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
4239

4340
SUBDIRS = . tests
4441

45-
bin_SCRIPTS = $(setup)
4642
libexec_SCRIPTS = $(checkdb)
4743

4844
legacyscriptsdir = $(systemdlegacyscriptsdir)/$(NAME_SERVICE)
@@ -66,9 +62,6 @@ noinst_DATA += $(TEST_GEN_FILES_LIST)
6662
$(ctl): $(ctl_in) $(text_tpl_deps)
6763
$(text_tpl_gen_script)
6864

69-
$(setup): $(setup_in) $(text_tpl_deps)
70-
$(text_tpl_gen_script)
71-
7265
$(checkdb): $(check) $(checkdb_in) $(text_tpl_deps)
7366
$(text_tpl_gen_script)
7467

@@ -114,6 +107,7 @@ EXTRA_DIST += \
114107
style.dsl
115108

116109
include $(srcdir)/share/postgresql-setup/Makefile.inc
110+
include $(srcdir)/bin/Makefile.inc
117111
include $(srcdir)/lib/rpm/Makefile.inc
118112
include $(srcdir)/sbin/Makefile.inc
119113
include $(srcdir)/doc/Makefile.inc

bin/Makefile.inc

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
setup = %D%/$(NAME_BINARYBASE)-setup
2+
setup_in = %D%/postgresql-setup.in
3+
4+
bin_SCRIPTS = $(setup)
5+
6+
$(setup): $(setup_in) $(text_tpl_deps)
7+
$(text_tpl_gen_script)
8+
9+
EXTRA_DIST += $(setup_in)
File renamed without changes.

doc/Makefile.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ if ! WANT_SYSVINIT
3131
dist_man_MANS += $(new_unit_man)
3232
endif
3333

34-
$(setup_man): $(NAME_BINARYBASE)-setup $(lib)
34+
$(setup_man): $(builddir)/bin/$(NAME_BINARYBASE)-setup $(lib)
3535
$(AM_V_GEN)odir=`dirname "$@"` ; mkdir -p "$$odir" ; \
36-
export input=$(builddir)/$(NAME_BINARYBASE)-setup ; \
36+
export input=$(builddir)/bin/$(NAME_BINARYBASE)-setup ; \
3737
$(HELP2MAN_RUN)
3838

3939
$(new_unit_man): sbin/$(NAME_BINARYBASE)-new-systemd-unit $(lib)

0 commit comments

Comments
 (0)