From 6834b2f8c9b77fe980bee4fb00aad6654883d7dc Mon Sep 17 00:00:00 2001 From: Daniel Bair Date: Thu, 2 Jul 2020 09:56:47 +0700 Subject: [PATCH 1/3] Update Makefile.am Allows setting the path for ronn and kramdown --- Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 55428b32..303b40af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,8 @@ pkgconfig_DATA = espeak-ng.pc SHARED_VERSION=2:51:1 # = *.so.1.1.51 MKDIR=mkdir -p +RONN=ronn +KRAMDOWN=kramdown # -Wno-endif-labels : Needed to prevent warnings in ieee80.c. AM_CFLAGS = \ @@ -79,10 +81,10 @@ SUFFIXES=.html .md .ronn .check .test .md.html: _layouts/webpage.html @echo " MD $@" @cat $< | sed -e 's/\.md)/.html)/g' -e 's/\.ronn/.html/g' | \ - kramdown --template _layouts/webpage.html > $@ + $(KRAMDOWN) --template _layouts/webpage.html > $@ .ronn.html: - ronn --html $< + $(RONN) --html $< ##### vim: @@ -101,10 +103,10 @@ EXTRA_DIST += $(vim_addons_syntax_DATA) ##### documentation: src/espeak-ng.1: src/espeak-ng.1.ronn - ronn --roff $< + $(RONN) --roff $< src/speak-ng.1: src/speak-ng.1.ronn - ronn --roff $< + $(RONN) --roff $< docs_MARKDOWN != ls docs/*.md docs/*/*.md docs/*/*/*.md docs_HTML = ${docs_MARKDOWN:.md=.html} From fd14487698d335d2f73c55a35cb8dac75da004d9 Mon Sep 17 00:00:00 2001 From: Daniel Bair Date: Fri, 3 Jul 2020 10:12:34 +0700 Subject: [PATCH 2/3] RONN is set by configure script --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 303b40af..9bb5f2d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,6 @@ pkgconfig_DATA = espeak-ng.pc SHARED_VERSION=2:51:1 # = *.so.1.1.51 MKDIR=mkdir -p -RONN=ronn KRAMDOWN=kramdown # -Wno-endif-labels : Needed to prevent warnings in ieee80.c. From b56c9429bc53cfc9f88ce6b6d8ea63a41bdb1c84 Mon Sep 17 00:00:00 2001 From: Daniel Bair Date: Fri, 3 Jul 2020 17:13:16 +0700 Subject: [PATCH 3/3] Add check for kramdown so that both RONN and KRAMDOWN are set by configure script --- Makefile.am | 1 - configure.ac | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 9bb5f2d8..22203a68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,6 @@ pkgconfig_DATA = espeak-ng.pc SHARED_VERSION=2:51:1 # = *.so.1.1.51 MKDIR=mkdir -p -KRAMDOWN=kramdown # -Wno-endif-labels : Needed to prevent warnings in ieee80.c. AM_CFLAGS = \ diff --git a/configure.ac b/configure.ac index bb124bb3..a333ab93 100644 --- a/configure.ac +++ b/configure.ac @@ -257,6 +257,8 @@ AC_CHECK_PROG(RONN, ronn, ronn, no) AM_CONDITIONAL(HAVE_RONN, [test ! x"$RONN" = xno]) +AC_CHECK_PROG(KRAMDOWN, kramdown, kramdown, no) + dnl ================================================================ dnl Extended dictionary checks. dnl ================================================================