Cleanup: use detected asciidoc to build CONTRIBUTING.html

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I3ed041bf02711fe5f3267865410756b8df8bfb3f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1352
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 341f83533695aa362093071c22394d2ce114109e..475b31a4d7bcabbe273af9680f262044ee68a819 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,8 @@ dist_noinst_DATA = CodingStyle
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
 
-CONTRIBUTING.html: $(srcdir)/CONTRIBUTING.adoc
-       asciidoc --verbose -a source-highlighter=pygments $<
+# This is a convenience target, it's not part of the build process.
+CONTRIBUTING.html: CONTRIBUTING.adoc
+       $(ASCIIDOC) --verbose -a source-highlighter=pygments $<
 
 CLEANFILES = CONTRIBUTING.html

diff --git a/configure.ac b/configure.ac
index 1f2400e3864ce1bd51dc25d6a2058f3d906326d6..f0ef757ad72717623565e77a223ff9ae5b2377e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -627,10 +627,10 @@ AS_IF([test "x$enable_api_doc" = "xyes"],
 have_asciidoc_xmlto=no
 warn_prebuilt_man_pages=no
 
-AS_IF([test "x$enable_man_pages" = "xyes"], [
-  AC_PATH_PROG([ASCIIDOC], [asciidoc], [no])
-  AC_PATH_PROG([XMLTO], [xmlto], [no])
+AC_PATH_PROG([ASCIIDOC], [asciidoc], [no])
+AC_PATH_PROG([XMLTO], [xmlto], [no])
 
+AS_IF([test "x$enable_man_pages" = "xyes"], [
   AS_IF([test "x$ASCIIDOC" = "xno" || test "x$XMLTO" = "xno"], [
     AS_IF([test "x$in_git_repo" = "xyes"], [
       # this is an error because we're in the Git repo, which