r45373 - in /packages/gmsh-tetgen/trunk/debian: gmsh-tetgen.install rules

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Tue Oct  2 15:22:52 2012
New Revision: 45373

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45373
Log:
add onelab

Modified:
    packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install
    packages/gmsh-tetgen/trunk/debian/rules

Modified: packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install?rev=45373&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install (original)
+++ packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.install Tue Oct  2 15:22:52 2012
@@ -2,4 +2,4 @@
 debian/*.desktop /usr/share/applications
 usr/bin
 
-projects/onelab/SOLVERS/onelab_client usr/bin
+projects/onelab/SOLVERS/onelab_client* usr/bin

Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=45373&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Tue Oct  2 15:22:52 2012
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 BUILDDIR = $(CURDIR)/debian/build
 JAVA_HOME=/usr/lib/jvm/default-java
+
+DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 
 # Add --with javahelper for java-wrappers
 
@@ -71,9 +73,7 @@
 	dh_auto_build
 	
 	# Buil onelab
-	export GMSH_DIR=$(CURDIR)
-	cd $GMSH_DIR/projects/onelab/SOLVERS
-	make
+	make -C $(CURDIR)/projects/onelab/SOLVERS STATICLINUX=$(DEB_HOST_ARCH_BITS) GMSH_DIR=$(CURDIR)
 	export GMSH_DIR=''
 	
 	# To avoid the texi2dvi pb add LC_ALL=C