changeset 54506:b156fd0a4607

8217448: Check for pandoc availability using ENABLE_PANDOC and not PANDOC Reviewed-by: tbell
author ihse
date Wed, 23 Jan 2019 10:23:05 +0100
parents 5c2c9555afc1
children 675d857f5ee3
files make/CompileToolsJdk.gmk make/UpdateBuildDocs.gmk
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileToolsJdk.gmk	Wed Jan 23 09:52:59 2019 +0100
+++ b/make/CompileToolsJdk.gmk	Wed Jan 23 10:23:05 2019 +0100
@@ -90,7 +90,7 @@
 
 # To be able to call the javascript filter when generating man pages using
 # pandoc, we need to create this executable wrapper script.
-ifneq ($(PANDOC), )
+ifeq ($(ENABLE_PANDOC), true)
   # PANDOC_TROFF_MANPAGE_FILTER is duplicated for export in ToolsJdk.gmk.
   PANDOC_TROFF_MANPAGE_FILTER := \
       $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-troff-manpage-filter
--- a/make/UpdateBuildDocs.gmk	Wed Jan 23 09:52:59 2019 +0100
+++ b/make/UpdateBuildDocs.gmk	Wed Jan 23 10:23:05 2019 +0100
@@ -34,7 +34,7 @@
 #
 ################################################################################
 
-ifeq ($(PANDOC), )
+ifeq ($(ENABLE_PANDOC), false)
   $(info No pandoc executable was detected by configure)
   $(error Cannot continue)
 endif