Merge from origin/emacs-24

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

diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32
index cc64ce722b78003d9bcbfe2d225784e7395ae8d7..f8a0a81b9fa8a1b626d56ae7f384abac26e08f6d 100755 (executable)
--- a/build-aux/msys-to-w32
+++ b/build-aux/msys-to-w32
@@ -1,9 +1,8 @@
 #!/bin/bash
-# Take a list of MSYS-compatible paths and convert them to native
-# MS-Windows format.
+# 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-2015 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
@@ -33,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 paths will be translated by looking for its
-deepest existing directory, which will be translated and the remainder
-will be appended.
+3. Translate absolute paths to Windows-native format.
 
 Options:
   --help     display this help and exit
@@ -79,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" ]