Mercurial > mxe-octave
changeset 5726:253afe03d71a
maint: merge with c/s 74e24bf4fa50
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Mon, 05 Apr 2021 07:25:52 -0400 |
parents | 6dcbce950b96 (current diff) 74e24bf4fa50 (diff) |
children | 60a500c74ac7 |
files | |
diffstat | 2 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Mon Apr 05 07:22:53 2021 -0400 +++ b/dist-files.mk Mon Apr 05 07:25:52 2021 -0400 @@ -349,6 +349,7 @@ mingw-portaudio-1-pkgconfig.patch \ mingw-s2tc-1-fixes.patch \ mingw-texinfo-1-fixes.patch \ + mingw-texinfo-2-makeinfo-non-ASCII-perl.patch \ mingw-utils-1-portability-fix.patch \ mingw-w64-1-float-h.patch \ mingw-w64.mk \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-texinfo-2-makeinfo-non-ASCII-perl.patch Mon Apr 05 07:25:52 2021 -0400 @@ -0,0 +1,16 @@ +"perl" cannot run scripts in paths with non-ASCII characters on Windows. +To work around that, change to the directory containing the script first, +then call it without path. +FIXME: Could changing the directory have negative side effects for the +"makeinfo" script? + +diff --git "a/util/makeinfo.bat" "b/util/makeinfo.bat" +index 5ae4286..6a51502 100644 +--- "a/util/makeinfo.bat" ++++ "b/util/makeinfo.bat" +@@ -1,2 +1,4 @@ + @echo off +-perl "%~dpn0" %* ++%~d0 ++cd "%~dp0" ++perl "%~n0" %*