From 4a9f5414b1793bedbfd0aebbb907009e680a6262 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 30 May 2019 11:10:15 -0400 Subject: [PATCH] Cleanup: use detected asciidoc to build CONTRIBUTING.html Signed-off-by: Michael Jeanson Change-Id: I3ed041bf02711fe5f3267865410756b8df8bfb3f Reviewed-on: https://review.lttng.org/c/babeltrace/+/1352 Reviewed-by: Philippe Proulx --- Makefile.am | 5 +++-- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 341f8353..475b31a4 100644 --- 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 1f2400e3..f0ef757a 100644 --- 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 -- 2.34.1