stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8217448: Check for pandoc availability using ENABLE_PANDOC and not PANDOC

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/CompileToolsJdk.gmk
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 # To be able to call the javascript filter when generating man pages using
# pandoc, we need to create this executable wrapper script. # 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 is duplicated for export in ToolsJdk.gmk.
PANDOC_TROFF_MANPAGE_FILTER := \ PANDOC_TROFF_MANPAGE_FILTER := \
$(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-troff-manpage-filter $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-troff-manpage-filter

2
make/UpdateBuildDocs.gmk
View File

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