OpenJDK / jdk / jdk
changeset 53087:f48737b2f428
8215635: Pandoc check in Docs.gmk does not work on Windows
Reviewed-by: tbell, ihse
| author | erikj |
|---|---|
| date | Thu, 20 Dec 2018 05:27:42 -0800 |
| parents | 026842c1809f |
| children | a682cf219811 |
| files | make/Docs.gmk make/autoconf/basics.m4 make/autoconf/spec.gmk.in make/launcher/LauncherCommon.gmk |
| diffstat | 4 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Docs.gmk Thu Dec 20 11:43:04 2018 +0100 +++ b/make/Docs.gmk Thu Dec 20 05:27:42 2018 -0800 @@ -517,7 +517,7 @@ ) \ ) -ifneq ($(PANDOC), ) +ifeq ($(ENABLE_PANDOC), true) # For all markdown files in $module/share/specs directories, convert them to # html, if we have pandoc (otherwise we'll just skip this).
--- a/make/autoconf/basics.m4 Thu Dec 20 11:43:04 2018 +0100 +++ b/make/autoconf/basics.m4 Thu Dec 20 05:27:42 2018 -0800 @@ -610,7 +610,14 @@ BASIC_PATH_PROGS(DF, df) BASIC_PATH_PROGS(CPIO, [cpio bsdcpio]) BASIC_PATH_PROGS(NICE, nice) + BASIC_PATH_PROGS(PANDOC, pandoc) + if test -n "$PANDOC"; then + ENABLE_PANDOC="true" + else + ENABLE_PANDOC="false" + fi + AC_SUBST(ENABLE_PANDOC) ]) ###############################################################################
--- a/make/autoconf/spec.gmk.in Thu Dec 20 11:43:04 2018 +0100 +++ b/make/autoconf/spec.gmk.in Thu Dec 20 05:27:42 2018 -0800 @@ -761,6 +761,7 @@ MSVCP_DLL:=@MSVCP_DLL@ UCRT_DLL_DIR:=@UCRT_DLL_DIR@ STLPORT_LIB:=@STLPORT_LIB@ +ENABLE_PANDOC:=@ENABLE_PANDOC@ #################################################### #
--- a/make/launcher/LauncherCommon.gmk Thu Dec 20 11:43:04 2018 +0100 +++ b/make/launcher/LauncherCommon.gmk Thu Dec 20 05:27:42 2018 -0800 @@ -203,7 +203,7 @@ ifneq ($(MAN_FILES_MD), ) # If we got markdown files, ignore the troff files - ifeq ($(PANDOC), ) + ifeq ($(ENABLE_PANDOC), false) $(info Warning: pandoc not found. Not generating man pages) else # Create dynamic man pages from markdown using pandoc. We need