8217448: Check for pandoc availability using ENABLE_PANDOC and not PANDOC

Reviewed-by: tbell
This commit is contained in:
Magnus Ihse Bursie 2019-01-23 10:23:05 +01:00
parent 46f1c74805
commit 3eeba36d07
2 changed files with 2 additions and 2 deletions

View File

@ -90,7 +90,7 @@ TARGETS += $(COMPILE_DEPEND) $(DEPEND_SERVICE_PROVIDER)
# 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

View File

@ -34,7 +34,7 @@ include ProcessMarkdown.gmk
#
################################################################################
ifeq ($(PANDOC), )
ifeq ($(ENABLE_PANDOC), false)
$(info No pandoc executable was detected by configure)
$(error Cannot continue)
endif