[Pkg-octave-commit] [SCM] Debian packaging for octave-nan branch, master, updated. 00e9c8a40e02ca23d74b507c31c7f8c7c7b5e0e8

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit d809b7ae58d9793c0fe0171ad9f04cb204b1614a
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Tue Sep 27 23:41:53 2011 +0200

    debian/patches/fix_makefile: refresh patch

diff --git a/debian/patches/fix_makefile b/debian/patches/fix_makefile
index b3ed28e..114323b 100644
--- a/debian/patches/fix_makefile
+++ b/debian/patches/fix_makefile
@@ -1,22 +1,22 @@
+Description: Do not try to build MATLAB stuff
+ In addition, do not clean binary MATLAB mex files, in order to make the package
+ build idempotent (we cannot regenerate these files).
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Forwarded: not-needed
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -9,9 +9,6 @@
- # Octave - global install  (e.g. from debian package)
- OCTAVE_VERSION = 
- INCOCTAVE = -I /usr/include/octave 
--# Octave - local install (e.g. compiled from sources) 
--OCTAVE_VERSION = -3.4.0
--INCOCTAVE = -I /usr/local/include/octave$(OCTAVE_VERSION)/octave 
+@@ -41,13 +41,7 @@
  
- # Matlab configuration
- MATLABDIR = /usr/local/MATLAB/R2010b
-@@ -37,8 +34,8 @@
- 
- PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex 
+ mex4o octave: $(PROGS)
  
+-ifneq ( , $(ls -1 $(MATLABDIR) ) )
 -MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
- octave: $(PROGS)
-+MEX_EXT = '.mex'
- matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
- mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
- all:    octave matlab win32
+-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
++all:    octave
+ 
+ clean:
+ 	-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* 

-- 
Debian packaging for octave-nan