changeset 4771:a08799ef1197

of-miscellaneous: use __octave_config_info__ * src/of-miscellaneous-3-dev-fixes.patch: new file * dist-files.mk: add of-miscellaneous-3-dev-fixes.patch
author John Donoghue
date Wed, 11 Jul 2018 13:35:05 -0400
parents 6cfa1fbe8d2f
children 7d3a56e36206
files dist-files.mk src/of-miscellaneous-3-dev-fixes.patch
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed Jul 11 13:35:03 2018 -0400
+++ b/dist-files.mk	Wed Jul 11 13:35:05 2018 -0400
@@ -495,6 +495,7 @@
   of-mapping.mk \
   of-miscellaneous-1-fixes.patch \
   of-miscellaneous-2-fixes.patch \
+  of-miscellaneous-3-dev-fixes.patch \
   of-miscellaneous.mk \
   of-nan.mk \
   of-netcdf.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-miscellaneous-3-dev-fixes.patch	Wed Jul 11 13:35:05 2018 -0400
@@ -0,0 +1,12 @@
+diff -ur miscellaneous-1.2.1.orig/inst/units.m miscellaneous-1.2.1/inst/units.m
+--- miscellaneous-1.2.1.orig/inst/units.m	2018-07-11 12:44:26.038777666 -0400
++++ miscellaneous-1.2.1/inst/units.m	2018-07-11 12:45:50.033750024 -0400
+@@ -107,7 +107,7 @@
+ 
+ function fpath = check_units ()
+   ## See bug #38270 about why we're checking this way.
+-  fpath = file_in_path (getenv ("PATH"), sprintf ("units%s", octave_config_info ("EXEEXT")));
++  fpath = file_in_path (getenv ("PATH"), sprintf ("units%s", __octave_config_info__ ("EXEEXT")));
+   if (isempty (fpath))
+     error ("units: %s\nVerify that GNU units is installed in the current path.",
+            rawoutput);