forked from msys2/MINGW-packages
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
octave: work around issue with MinGW makeinfo
When trying to use the MinGW version of `makeinfo` displaying a help message fails with an error like the following: ``` Can't call method "name" on an undefined value at makeinfo line 508. ``` That is a regression. Restore the work-around that was used previously and was removed in msys2@cacaa18
- Loading branch information
Showing
2 changed files
with
29 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# HG changeset patch | ||
# User Markus Mützel <[email protected]> | ||
# Date 1647626170 -3600 | ||
# Fri Mar 18 18:56:10 2022 +0100 | ||
# Branch stable | ||
# Node ID fa26a529cf60ee8e048390eac38c33f92d4d8b11 | ||
# Parent 4d2da8a3dca69327150b4ecc5e6b7bb9630877e5 | ||
Set up for correctly executing makeinfo perl script on Windows. | ||
* scripts/startup/version-rcfile: On Windows, perl scripts cannot be executed | ||
using the shebang mechanism. Set up for calling it with perl explicitly instead. | ||
diff -r 4d2da8a3dca6 -r fa26a529cf60 scripts/startup/version-rcfile | ||
--- a/scripts/startup/version-rcfile Thu Mar 17 16:41:42 2022 +0100 | ||
+++ b/scripts/startup/version-rcfile Fri Mar 18 18:56:10 2022 +0100 | ||
@@ -25,3 +25,8 @@ | ||
if (strcmp (PAGER (), "less") && isempty (getenv ("LESS"))) | ||
PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"'); | ||
endif | ||
+ | ||
+## On Windows, perl scripts must be run using the perl interpreter | ||
+[~, tempval] = system ("cygpath -w /usr/bin"); | ||
+makeinfo_program (sprintf ("%s && cd %s && perl makeinfo", tempval(1:2), strtrim (tempval))); | ||
+clear ("tempval"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters