[vlfeat] 33/44: [bugfix] doc.mak: fixes generating MATLAB help index for different versions of MATLAB

[Dima Kogan]

This is an automated email from the git hooks/post-receive script.

dkogan-guest pushed a commit to branch master
in repository vlfeat.

commit 04f16e06da3ef6ca83c7e3cc2a986c7402f9cff2
Author: Andrea Vedaldi <vedaldi at gmail.com>
Date:   Thu Jan 15 00:30:59 2015 +0000

    [bugfix] doc.mak: fixes generating MATLAB help index for different versions of MATLAB
---
 make/doc.mak | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/make/doc.mak b/make/doc.mak
index fdd1ea2..6ec8d7d 100644
--- a/make/doc.mak
+++ b/make/doc.mak
@@ -52,7 +52,11 @@ $(eval $(call gendir, results, results))
 .PHONY: doc-deep
 
 ifdef MATLAB_PATH
+ifeq ($(call gt,$(MATLAB_VER),80300),)
 doc-matlab: doc/matlab/helpsearch-v2/segments.gen
+else
+doc-matlab: doc/matlab/helpsearch/deletable
+endif
 endif
 
 # use MATLAB to create the figures for the tutorials
@@ -74,6 +78,14 @@ doc/matlab/helpsearch-v2/segments.gen : doc/build/matlab/helpsearch-v2/segments.
 doc/build/matlab/helpsearch-v2/segments.gen: doc/build/matlab/helptoc.xml
 	$(MATLAB_EXE) -$(ARCH) -nodisplay -r "builddocsearchdb('doc/build/matlab/') ; exit"
 
+# for older MATLABs
+doc/matlab/helpsearch/deletable : doc/build/matlab/helpsearch/deletable $(doc-dir)
+	cp -v doc/build/matlab/helptoc.xml doc/matlab/
+	cp -rv doc/build/matlab/helpsearch doc/matlab/
+
+doc/build/matlab/helpsearch/deletable: doc/build/matlab/helptoc.xml
+	$(MATLAB_EXE) -$(ARCH) -nodisplay -r "builddocsearchdb('doc/build/matlab/') ; exit"
+
 # --------------------------------------------------------------------
 #                                                                 MDoc
 # --------------------------------------------------------------------

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vlfeat.git