File tree 2 files changed +4
-4
lines changed
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -86,7 +86,7 @@ putpathvar() {
86
86
else
87
87
printf " configure: %-20s := %s %s\n" $1 " $T " " $2 "
88
88
fi
89
- printf " %-20s := %q \n" $1 " $T " >> config.tmp
89
+ printf " %-20s := \" %s \" \n" $1 " $T " >> config.tmp
90
90
}
91
91
92
92
probe () {
@@ -651,9 +651,9 @@ probe CFG_ADB adb
651
651
652
652
if [ ! -z " $CFG_PANDOC " ]
653
653
then
654
- PV_MAJOR_MINOR=$( pandoc --version | grep ' ^pandoc ' |
654
+ PV_MAJOR_MINOR=$( pandoc --version | grep ' ^pandoc\(.exe\)\? ' |
655
655
# 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 /' )
657
657
658
658
MIN_PV_MAJOR=" 1"
659
659
MIN_PV_MINOR=" 9"
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ ifndef CFG_DISABLE_MANAGE_SUBMODULES
19
19
# (nothing checked out at all). `./configure --{llvm,jemalloc}-root`
20
20
# will explicitly deinitialize the corresponding submodules, and we don't
21
21
# 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 '^+')
23
23
else
24
24
NEED_GIT_RECONFIG =0
25
25
endif
You can’t perform that action at this time.
0 commit comments