[Pkg-octave-commit] rev 757 - trunk/packages/octaviz/debian

[Thomas Weber]

Author: thomas-guest
Date: 2006-09-26 07:49:37 +0000 (Tue, 26 Sep 2006)
New Revision: 757

Modified:
   trunk/packages/octaviz/debian/rules
Log:
Get current version of octave-config on the buildds <sigh>


Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules	2006-09-25 15:33:21 UTC (rev 756)
+++ trunk/packages/octaviz/debian/rules	2006-09-26 07:49:37 UTC (rev 757)
@@ -21,6 +21,9 @@
 deboct = $(debdir)$(OCTDIR)
 debfcn = $(debdir)$(MDIR)
 
+# Needed to override dangling symlink on the autobuilders. The issues with the
+# autobuilders need to be resolved post-etch
+OCT_VER = $(shell octave --version  | grep --only-matching  2.1.[[:xdigit:]]*)
 
 cmake: cmake-stamp
 cmake-stamp:
@@ -28,8 +31,10 @@
 	# reintroduce tests; failing autobuilders are fun ...
 	ls -l /usr/bin/oct*
 	ls -l /etc/alternatives/oct*
-	/bin/sh debian/check-symlink.sh
-	cmake -DCMAKE_SKIP_RPATH:BOOL=YES -DVTK_DIR:STRING=/usr/lib/vtk .
+	# /bin/sh debian/check-symlink.sh
+	cmake	-DCMAKE_SKIP_RPATH:BOOL=YES 				\
+		-DVTK_DIR:STRING=/usr/lib/vtk				\
+		-DOCTAVE_CONFIG:FILEPATH=/usr/bin/octave-config-$(OCT_VER) .
 	touch cmake-stamp
 
 build: build-stamp