[pacman-dev] [PATCH] autotools: be more templated when getting list of doc dist files

Eli Schwartz eschwartz at archlinux.org
Thu Oct 24 06:54:31 UTC 2019


Distribute asciidoc sources for all manpages instead of remembering to
add files to both variables. Fixes regression in
377d47142f7aaa01ca782e6587f2d4caf663865b which broke building the
website from a dist tarball:

make: *** No rule to make target 'pacman-conf.8.html', needed by 'html'.  Stop.

(Technically this regression is already fixed by commit
942b909829d529409216939b36af11e8480726f5, but this is just going to keep
happening, I suspect, so we should fix the root cause.)

Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
---

And in fact, this is the spiritual successor to commit a769fbfd402b149e4fee5ce65b26bae8c56b5d43

 doc/Makefile.am | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 195f0b14..c61110fc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,6 +21,7 @@ MANPAGES = \
 DOXYGEN_MANS = $(wildcard man3/*.3)
 
 HTML_MANPAGES = $(addsuffix .html,$(MANPAGES))
+ASCIIDOC_MANPAGES = $(addsuffix .asciidoc,$(MANPAGES))
 
 HTML_OTHER = \
 	index.html \
@@ -36,24 +37,12 @@ EXTRA_DIST = \
 	meson.build \
 	asciidoc.conf \
 	asciidoc-override.css \
-	alpm-hooks.5.asciidoc \
-	pacman.8.asciidoc \
-	makepkg.8.asciidoc \
-	makepkg-template.1.asciidoc \
-	repo-add.8.asciidoc \
-	vercmp.8.asciidoc \
-	pacman-key.8.asciidoc \
-	PKGBUILD.5.asciidoc \
 	PKGBUILD-example.txt \
-	makepkg.conf.5.asciidoc \
-	pacman.conf.5.asciidoc \
-	BUILDINFO.5.asciidoc \
-	pacman-conf.8.asciidoc \
-	libalpm.3.asciidoc \
 	footer.asciidoc \
 	index.asciidoc \
 	submitting-patches.asciidoc \
 	translation-help.asciidoc \
+	$(ASCIIDOC_MANPAGES) \
 	$(MANPAGES) \
 	$(DOXYGEN_MANS)
 
-- 
2.23.0


More information about the pacman-dev mailing list