Skip to content

Commit 2456272

Browse files
committed
auto merge of #10222 : nibrahim/rust/docfix, r=brson
Earlier versions of pandoc don't have the `default.html5` template file. When `make docs` is run, the build process fails with this message. pandoc: doc/rust.html pandoc: /usr/share/pandoc-1.8.2.1/templates/default.html5: openFile: does not exist (No such file or directory) node.js:201 throw e; // process.nextTick error, or 'error' event on first tick ^ Error: write EPIPE at errnoException (net.js:670:11) at Object.afterWrite [as oncomplete] (net.js:503:19) make: *** [doc/rust.html] Error 1
2 parents c15038d + 60cb1fb commit 2456272

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

configure

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,12 +463,14 @@ then
463463
# extract the first 2 version fields, ignore everything else
464464
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
465465

466+
MIN_PV_MAJOR="1"
467+
MIN_PV_MINOR="9"
466468
# these patterns are shell globs, *not* regexps
467469
PV_MAJOR=${PV_MAJOR_MINOR% *}
468470
PV_MINOR=${PV_MAJOR_MINOR#* }
469-
if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
471+
if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ]
470472
then
471-
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
473+
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"
472474
BAD_PANDOC=1
473475
fi
474476
fi

0 commit comments

Comments
 (0)