Skip to content

Commit 461945e

Browse files
vharavyVitali Haravy
authored and
Vitali Haravy
committedNov 6, 2014
Correct building documenation with Pandoc and TeX on Windows.
1 parent bec2ee7 commit 461945e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎configure

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ putpathvar() {
8686
else
8787
printf "configure: %-20s := %s %s\n" $1 "$T" "$2"
8888
fi
89-
printf "%-20s := %q\n" $1 "$T" >>config.tmp
89+
printf "%-20s := \"%s\"\n" $1 "$T" >>config.tmp
9090
}
9191

9292
probe() {
@@ -651,9 +651,9 @@ probe CFG_ADB adb
651651

652652
if [ ! -z "$CFG_PANDOC" ]
653653
then
654-
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' |
654+
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc\(.exe\)\? ' |
655655
# extract the first 2 version fields, ignore everything else
656-
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
656+
sed 's/pandoc\(.exe\)\? \([0-9]*\)\.\([0-9]*\).*/\2 \3/')
657657

658658
MIN_PV_MAJOR="1"
659659
MIN_PV_MINOR="9"

‎mk/reconfig.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ifndef CFG_DISABLE_MANAGE_SUBMODULES
1919
# (nothing checked out at all). `./configure --{llvm,jemalloc}-root`
2020
# will explicitly deinitialize the corresponding submodules, and we don't
2121
# want to force constant rebuilds in that case.
22-
NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status | grep -c '^+')
22+
NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && $(CFG_GIT) submodule status | grep -c '^+')
2323
else
2424
NEED_GIT_RECONFIG=0
2525
endif

0 commit comments

Comments
 (0)