Fix shr.el/image build problem

[gnu-emacs] / build-aux / msys-to-w32

diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32
index f8a0a81b9fa8a1b626d56ae7f384abac26e08f6d..8b1c970b99666fdce648b0f1a9b7b0eaa02d37d5 100755 (executable)
--- a/build-aux/msys-to-w32
+++ b/build-aux/msys-to-w32
@@ -2,7 +2,7 @@
 # Convert a MSYS path list to Windows-native format.
 # Status is zero if successful, nonzero otherwise.
 
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2016 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -96,7 +96,7 @@ do
        # translate the existing part and append the rest
        w32p=$(cd "${p1}" && pwd -W)
        remainder=${p#$p1}
-       w32p+=/${remainder#/}
+       w32p=${w32p%/}/${remainder#/}
     fi
 
     w32pathlist="${w32pathlist};${w32p}"