Skip to content

Commit 029b10e

Browse files
committed
doc: fix distcheck generation of postgresql-setup.1 Drop one Makefile.am subdir.. * doc/Makefile.am: Moved to doc/Makefile.inc. * Makefile.am: Include doc/Makefile.inc. (DISTCLEANFILES): Properly define and append to it.
1 parent 6672de1 commit 029b10e

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Makefile.am

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ EXTRA_DIST =
2525
INTERMEDIATE_FILES =
2626
GENERATED_FILES =
2727
CLEANFILES =
28+
DISTCLEANFILES =
2829
_AX_TEXT_ADDITIONAL_SED_SUBSTITUTIONS =
2930

3031
DISTCHECK_CONFIGURE_FLAGS = \
@@ -38,7 +39,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
3839

3940
# include $(srcdir)/build-helpers/Makefile.inc
4041

41-
SUBDIRS = . doc tests
42+
SUBDIRS = . tests
4243

4344
bin_SCRIPTS = $(setup)
4445
libexec_SCRIPTS = $(ctl) $(checkdb)
@@ -112,6 +113,7 @@ EXTRA_DIST += \
112113

113114
include $(srcdir)/share/postgresql-setup/Makefile.inc
114115
include $(srcdir)/lib/rpm/Makefile.inc
116+
include $(srcdir)/doc/Makefile.inc
115117

116118
GENERATED_FILES += \
117119
$(bin_SCRIPTS) \
@@ -171,4 +173,4 @@ ChangeLog:
171173

172174
dist-hook: ChangeLog
173175

174-
DISTCLEANFILES = ChangeLog
176+
DISTCLEANFILES += ChangeLog

doc/Makefile.inc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ HELP2MAN_RUN = \
2121
test $$rs -eq 0 ; \
2222
fi
2323

24-
setup_man = $(srcdir)/$(NAME_BINARYBASE)-setup.1
24+
setup_man = %D%/$(NAME_BINARYBASE)-setup.1
2525

2626
dist_man_MANS = $(setup_man)
2727

28-
$(setup_man): $(top_srcdir)/postgresql-setup
29-
$(AM_V_GEN)export input=$(top_srcdir)/$(NAME_BINARYBASE)-setup ; \
28+
$(setup_man): $(NAME_BINARYBASE)-setup
29+
$(AM_V_GEN)export input=$(NAME_BINARYBASE)-setup ; \
3030
$(HELP2MAN_RUN)
31+
32+
DISTCLEANFILES += $(setup_man)

0 commit comments

Comments
 (0)