From 3eeba36d07327bbd7e34324da49d93e2349a6d2c Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 23 Jan 2019 10:23:05 +0100
Subject: [PATCH] 8217448: Check for pandoc availability using ENABLE_PANDOC
 and not PANDOC

Reviewed-by: tbell
---
 make/CompileToolsJdk.gmk | 2 +-
 make/UpdateBuildDocs.gmk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
index 9753eef44c2..b89afa0eafc 100644
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -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
diff --git a/make/UpdateBuildDocs.gmk b/make/UpdateBuildDocs.gmk
index 51f7a6588c5..011be4c620e 100644
--- a/make/UpdateBuildDocs.gmk
+++ b/make/UpdateBuildDocs.gmk
@@ -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