r45640 - /packages/getdp/trunk/debian/rules

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

Author: trophime-guest
Date: Mon Mar 11 14:02:17 2013
New Revision: 45640

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45640
Log:
up

Modified:
    packages/getdp/trunk/debian/rules

Modified: packages/getdp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/rules?rev=45640&op=diff
==============================================================================
--- packages/getdp/trunk/debian/rules (original)
+++ packages/getdp/trunk/debian/rules Mon Mar 11 14:02:17 2013
@@ -4,20 +4,19 @@
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
 
 # PETSC_DIR is the location of PETSc.
+export SLEPC_DIR=/usr/lib/slepcdir/3.2
 export PETSC_DIR=/usr/lib/petscdir/3.2
-export SLEPC_DIR=/usr/lib/slepcdir/3.2
 
 # Fix FTBS on armhf
-ifneq ("", findstring("$(DEB_HOST_ARCH)", "armel armhf"))
+export PETSC_ARCH=linux-gnu-c-opt
 ifeq ("armhf", "$(DEB_HOST_ARCH)")
 export PETSC_ARCH=linux-gnueabihf-c-opt
 endif
 ifeq ("armel", "$(DEB_HOST_ARCH)")
 export PETSC_ARCH=linux-gnueabi-c-opt
 endif
-else
-export PETSC_ARCH=linux-gnu-c-opt
-endif
+
+echo "PETSC_ARCH=" $PETSC_ARCH
 
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel