From 9ebb91411aaf57c0ccc5667b2f0743c5454fd1da Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 21 Apr 2019 01:21:56 +0100 Subject: CONFIGURE: Generate html README and NEWS by default on macOS There was already a configure option to specify a output format other than plain text, but this had to be specified explicitely when executing configure. Now the ports can define a default other than plain text. On macOS now by default pandoc generate html output. It could in theory also generate rtf, but those are not properly displayed by TextEdit, and in addition TextEdit cannot handle link internal to the document (such as for the TOC). But if we are fine with no link for the TOC, we could pipe the pandoc html output with textutil to generate the RTF documents. Also this change allows to have an extension for the pandoc output files. By default this is empty for plain text (as before) and the same as the format otherwise (for example .rtf or .html). --- Makefile.common | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile.common') diff --git a/Makefile.common b/Makefile.common index b058ae9a13..c6c47fd075 100644 --- a/Makefile.common +++ b/Makefile.common @@ -13,7 +13,7 @@ all: $(EXECUTABLE).dwp endif ifdef USE_PANDOC -all: README NEWS +all: README$(PANDOCEXT) NEWS$(PANDOCEXT) endif ###################################################################### @@ -237,10 +237,10 @@ VERFILE := $(DISTDIR)/$(DISTNAME)/base/internal_version.h ifdef USE_PANDOC # Convert README.md and NEWS.md to plain text for any platform that might require it -README: ${srcdir}/README.md +README$(PANDOCEXT): ${srcdir}/README.md $(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $< -NEWS: ${srcdir}/NEWS.md +NEWS$(PANDOCEXT): ${srcdir}/NEWS.md $(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $< endif @@ -275,7 +275,7 @@ dist-src: \ # Common files DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYRIGHT NEWS.md README.md) ifdef USE_PANDOC -DIST_FILES_DOCS+=README NEWS +DIST_FILES_DOCS+=README$(PANDOCEXT) NEWS$(PANDOCEXT) endif DIST_FILES_DOCS_languages=cz da de es fr it no-nb se -- cgit v1.2.3