summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorTomofumi Yagi <yagit@mknada.sakura.ne.jp>2014-01-04 17:01:55 +0900
committerAndras Timar <andras.timar@collabora.com>2014-01-06 10:39:33 +0000
commit91bbb55f2877aada6f4bee966185287eeb3aaadd (patch)
tree82c2796a8d02fb46251be3836dd6f233e6e1673a /configure.ac
parentddaceeaf227f5e0f2dbc6016ac20632421758adc (diff)
$MSM_PATH($msmdir) needs a path separator at the end of the line.
A error occurs in Visual Studio Express and Windows 7/8/8.1 environment, if a path separator at the end of the line is missing. The registry entry for Merge Module directory has a path separator as suffix. Change-Id: Ic1c51716631980e89f5bfa11a1d76b45c35e920e Reviewed-on: https://gerrit.libreoffice.org/7272 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 9a764f5caa70..2047a6b40e3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5199,8 +5199,8 @@ find_msms()
fi
done
if test -z "$msmdir"; then
- AC_MSG_NOTICE([no registry entry for Merge Module directory - trying "$COMMONPROGRAMFILES\Merge Modules"])
- msmdir="$COMMONPROGRAMFILES\Merge Modules"
+ AC_MSG_NOTICE([no registry entry for Merge Module directory - trying "${COMMONPROGRAMFILES}/Merge Modules/"])
+ msmdir="${COMMONPROGRAMFILES}/Merge Modules/"
fi
msmdir=`cygpath -m "$msmdir"`
if test -z "$msmdir"; then