Update copyright year to 2016

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

diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32
index f8c37222889e11754e101f4ca8c499a83df3972c..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-2014 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
@@ -32,14 +32,7 @@ written to the standard output after performing these transformations:
 
 1. Discard empty paths.
 2. Replace: '\' with '/', '//' with '/' and ':' with ';'.
-3. Translate each path to Windows-native format.
-
-Relative paths or paths starting with '%emacs_dir%' will be passed
-verbatim to the standard output.
-
-Each non existing absolute path will be translated by looking for its
-deepest existing directory, which will be translated and the remainder
-appended.
+3. Translate absolute paths to Windows-native format.
 
 Options:
   --help     display this help and exit
@@ -78,10 +71,7 @@ for p
 do
     [ -z "$p" ] && continue
 
-    if [ "${p:0:11}" = "%emacs_dir%" ]
-    then
-       w32p=$p
-    elif [ "${p:0:1}" != "/" ]
+    if [ "${p:0:1}" != "/" ]
     then
        w32p=$p
     elif [ -d "$p" ]
@@ -106,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}"