diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2021-01-17 14:42:10 +0100 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2021-01-17 14:42:10 +0100 |
| commit | b7b812fbe69734c119a5261346e31b8412fdb832 (patch) | |
| tree | 60e96bf99bf31ac0d3da938183f4244f29a7d05a /ar-lib | |
| parent | 37a00e988304dd8b3b04886b56ecc713347f596f (diff) | |
Update files from latest automake
Diffstat (limited to 'ar-lib')
| -rwxr-xr-x | ar-lib | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC +scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2020 Free Software Foundation, Inc. # Written by Peter Rosin <peda@lysator.liu.se>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -65,7 +65,7 @@ func_file_conv () mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin) + cygwin | msys) file=`cygpath -m "$file" || echo "$file"` ;; wine) @@ -224,10 +224,11 @@ elif test -n "$extract"; then esac done else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done + $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \ + | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done fi elif test -n "$quick$replace"; then |