From: Karel Zak <kzak@redhat.com>
Date: Fri, 4 Jun 2021 09:42:03 +0000 (+0200)
Subject: build-sys: make re-use of generated man-pages more robust
X-Git-Tag: v2.37.1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af5527f45e627a3167da1f9afc325acc58418be3;p=thirdparty%2Futil-linux.git

build-sys: make re-use of generated man-pages more robust

We need to ignore man-pages at all if not available (not generated
yet), but asciidoctor is not installed.

Fix: https://github.com/karelzak/util-linux/issues/1334
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/Makefile.am b/Makefile.am
index e40b4ec590..f5a74b5ddb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -195,10 +195,10 @@ $(PATHFILES): Makefile
 	@ mv $@.tmp $@
 
 
+if ENABLE_ASCIIDOC
 EXTRA_DIST += $(ADOCFILES_COMMON) $(MANPAGES) $(MANLINKS)
 man_MANS += $(MANPAGES) $(MANLINKS)
 
-if ENABLE_ASCIIDOC
 $(MANPAGES): $(ADOCFILES_COMMON)
 
 asciidoc_man_cmd = $(ASCIIDOCTOR) \
@@ -219,6 +219,12 @@ $(MANLINKS): $(MANPAGES)
 gen-man: $(man_MANS)
 
 else
+
+if HAVE_MANPAGES
+EXTRA_DIST += $(ADOCFILES_COMMON) $(MANPAGES) $(MANLINKS)
+man_MANS += $(MANPAGES) $(MANLINKS)
+endif
+
 gen-man:
 endif
 
diff --git a/configure.ac b/configure.ac
index a87d01d7f4..0b15260f13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -742,6 +742,13 @@ UL_BUILD_INIT([asciidoc])
 UL_REQUIRES_PROGRAM([asciidoc], [ASCIIDOCTOR], [asciidoctor], [man pages])
 AM_CONDITIONAL([ENABLE_ASCIIDOC], [test "x$build_asciidoc" = xyes])
 
+have_manpages=no
+AS_IF([test -f "$srcdir/sys-utils/mount.8"], [
+   AC_MSG_NOTICE([re-use already generated man-pages.])
+   have_manpages=yes]
+)
+AM_CONDITIONAL([HAVE_MANPAGES], [test "x$have_manpages" = xyes])
+
 
 AC_ARG_ENABLE([poman],
   AS_HELP_STRING([--enable-poman], [generate translated man pages]),