Mercurial > forge

changeset 10621:7740a34f1dac octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix message on missing mexext
author schloegl
date Fri, 03 Aug 2012 19:49:11 +0000
parents 8194dc2114e4
children f24541c3879e
files extra/NaN/src/Makefile extra/tsa/src/Makefile
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/src/Makefile	Fri Aug 03 15:56:49 2012 +0000
+++ b/extra/NaN/src/Makefile	Fri Aug 03 19:49:11 2012 +0000
@@ -41,7 +41,7 @@
 
 mex4o octave: $(PROGS)
 
-ifneq ( , $(ls -1 $(MATLABDIR) ) )
+ifneq (,$(ls -1 $(MATLABDIR)))
 MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
 mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
 endif
@@ -52,7 +52,7 @@
 clean:
 	-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* 
 
-$(PROGS): Makefile
+#$(PROGS): Makefile
 
 #########################################################
 #	Octave, MATLAB on Linux 
--- a/extra/tsa/src/Makefile	Fri Aug 03 15:56:49 2012 +0000
+++ b/extra/tsa/src/Makefile	Fri Aug 03 19:49:11 2012 +0000
@@ -51,10 +51,11 @@
 
 mex4o octave: $(PROGS)
 
-ifneq ( , $(ls -1 $(MATLABDIR) ) )
+ifneq (,$(ls -1 $(MATLABDIR)))
 MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
 mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
 endif
+
 mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
 mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
 all:    octave win32 win64 mex4m