diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | build-aux/msys-to-w32 | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 28d67634c79..33f9f6bca15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-30 Dani Moncayo <dmoncayo@gmail.com> + + * build-aux/msys-to-w32 (w32pathlist): Do not translate paths + starting with %emacs_dir%. + 2013-11-30 Glenn Morris <rgm@gnu.org> Stop keeping (most) generated cedet grammar files in the repository. diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32 index e45ec3cb7e2..a617f18af4b 100755 --- a/build-aux/msys-to-w32 +++ b/build-aux/msys-to-w32 @@ -36,7 +36,8 @@ transformations: 3. Replace two consecutive slashes with single ones. 4. Translate to Windows-native format those paths that are not in such format already. The translated paths will not end with a slash, - except for root directories (e.g. 'c:/' or 'c:/foo'). + except for root directories (e.g. 'c:/' or 'c:/foo'). Paths + starting with '%emacs_dir%' will not be translated. 5. Escape with backslashes every occurrence of SEPARATOR2 within the paths. 6. Concatenate the translated paths with SEPARATOR2. @@ -100,7 +101,11 @@ do p="${p//\\//}" p="${p//\/\///}" - if test -d "$p" + if test "${p:0:11}" = "%emacs_dir%" + then + # Paths starting with "%emacs_dir%" will not be translated + w32p=$p + elif test -d "$p" then # The path exists, so just translate it w32p=`cd "$p" && pwd -W` @@ -162,4 +167,4 @@ do done # Write the translated pathlist to the standard output -printf "${w32pathlist}" +printf "%s" "${w32pathlist}" |