make/common/ProcessMarkdown.gmk
changeset 45227 97be1bcd7b25
parent 44983 4e216c0475ee
child 52714 2e52aa822c57
child 56891 78ed9c424877
--- a/make/common/ProcessMarkdown.gmk	Tue May 16 14:14:26 2017 +0200
+++ b/make/common/ProcessMarkdown.gmk	Wed May 17 12:42:58 2017 +0200
@@ -36,7 +36,7 @@
     ifneq ($$(findstring http:/, $$($1_CSS)), )
       $1_$2_CSS_OPTION := --css '$$($1_CSS)'
     else
-      $1_$2_CSS := $$(call RelativePath, $$($1_CSS), $$($1_$2_TARGET_DIR))
+      $1_$2_CSS := $$(strip $$(call RelativePath, $$($1_CSS), $$($1_$2_TARGET_DIR)))
       $1_$2_CSS_OPTION := --css '$$($1_$2_CSS)'
     endif
   endif
@@ -51,7 +51,7 @@
 	$$(call LogInfo, Converting $2 to html)
 	$$(call MakeDir, $$($1_$2_TARGET_DIR) $$(SUPPORT_OUTPUTDIR)/markdown)
 	$$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER), \
-	    $$(PANDOC) $$($1_OPTIONS) -f markdown -t html --standalone \
+	    $$(PANDOC) $$($1_OPTIONS) -f markdown -t html5 --standalone \
 	    $$($1_$2_CSS_OPTION) $$($1_$2_OPTIONS) '$$<' -o '$$@')
         ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
 	TOO_LONG_LINES=`$$(GREP) -E -e '^.{80}.+$$$$' $$<` || true ; \