Mercurial > forge

changeset 12381:89c83490ab0d octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tsa: avoid spurios error messages when no Matlab is installed
author schloegl
date Wed, 26 Feb 2014 17:20:26 +0000
parents 1af331a4c3dd
children 5c506ea5f24f
files extra/tsa/src/Makefile
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/extra/tsa/src/Makefile	Fri Feb 21 15:58:45 2014 +0000
+++ b/extra/tsa/src/Makefile	Wed Feb 26 17:20:26 2014 +0000
@@ -58,18 +58,18 @@
 
 ### Matlab configuration - search for a matlab directory if not defined above
 ifndef MATLABDIR
-  ifneq ('',$(shell ls -1 /usr/local/MATLAB))
+  ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
     # use oldest, typically mex-files a compatible with newer Matlab versions 
-    MATLABDIR=$(shell ls -dt1 /usr/local/MATLAB/R* |tail -1)
+    MATLABDIR=$(shell ls -1t /usr/local/MATLAB/  |grep "^R*" |head -1)
     # alternatively, use latest matlab version
     #MATLABDIR=$(shell ls -dt1 /usr/local/MATLAB/R* |head -1)
   endif
 endif
 
 ### if the MATLABDIR has been found or defined 
-ifneq ('',MATLABDIR)
-  ifneq ('',$(lshell ls -1 $(MATLABDIR)))
-    MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
+ifneq (,MATLABDIR)
+  ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
+    MEX_EXT=$(shell $(MATLABDIR)/bin/mexext)
     mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
   endif
 endif