From 95d4678de78f7c09b247161811660cefea1d24c5 Mon Sep 17 00:00:00 2001 From: Lothar Serra Mari Date: Sat, 18 May 2019 14:03:43 +0200 Subject: NEWS: Convert German NEWS file to Markdown (#1627) * NEWS: Convert German NEWS file to Markdown * NEWS: Fix Markdown conversion errors in NEUES.md * BUILD: Add the German NEWS file to the build system * NEWS: Fix formatting in NEUES.md --- Makefile.common | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'Makefile.common') diff --git a/Makefile.common b/Makefile.common index 07dfbd28ae..d937536fc7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -13,7 +13,7 @@ all: $(EXECUTABLE).dwp endif ifdef USE_PANDOC -all: README$(PANDOCEXT) NEWS$(PANDOCEXT) +all: README$(PANDOCEXT) NEWS$(PANDOCEXT) doc/de/NEUES$(PANDOCEXT) endif ###################################################################### @@ -237,11 +237,9 @@ 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$(PANDOCEXT): ${srcdir}/README.md - $(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $< - -NEWS$(PANDOCEXT): ${srcdir}/NEWS.md - $(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $< +%$(PANDOCEXT): ${srcdir}/%.md + $(QUIET)$(MKDIR) $(*D) + $(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) --metadata pagetitle=$(basename $(notdir $@)) -s -o $@ $< endif # TODO git via $(GITROOT) @@ -281,7 +279,10 @@ endif DIST_FILES_DOCS_languages=cz da de es fr it no-nb se DIST_FILES_DOCS_cz:=$(addprefix $(srcdir)/doc/cz/,PrectiMe) DIST_FILES_DOCS_da:=$(addprefix $(srcdir)/doc/da/,HurtigStart) -DIST_FILES_DOCS_de:=$(addprefix $(srcdir)/doc/de/,LIESMICH NEUES Schnellstart) +DIST_FILES_DOCS_de:=$(addprefix $(srcdir)/doc/de/,LIESMICH NEUES.md Schnellstart) +ifdef USE_PANDOC +DIST_FILES_DOCS_de+=doc/de/NEUES$(PANDOCEXT) +endif DIST_FILES_DOCS_es:=$(addprefix $(srcdir)/doc/es/,InicioRapido) DIST_FILES_DOCS_fr:=$(addprefix $(srcdir)/doc/fr/,DemarrageRapide) DIST_FILES_DOCS_it:=$(addprefix $(srcdir)/doc/it/,GuidaRapida) -- cgit v1.2.3