[Libreoffice-commits] core.git: configure.ac

[Tomofumi Yagi]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 91bbb55f2877aada6f4bee966185287eeb3aaadd
Author: Tomofumi Yagi <yagit at mknada.sakura.ne.jp>
Date:   Sat Jan 4 17:01:55 2014 +0900

    $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 at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/configure.ac b/configure.ac
index 9a764f5..2047a6b 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