[med-svn] [relion] 04/36: d/rules: Add manual build target

[Roland Fehrenbacher]

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

rfehren-guest pushed a commit to branch master
in repository relion.

commit bf98342e8f640668bb4f9233a428c16b87336126
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Fri Oct 10 18:21:24 2014 +0000

    d/rules: Add manual build target
---
 debian/rules | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index e5a891f..4d64397 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 DEBVENDOR  := $(shell dpkg-vendor --query Vendor)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifeq ($(DEBVENDOR), Qlustar)
     # Qlustar specific stuff
@@ -15,24 +15,29 @@ else
     MPICXX := mpicxx.openmpi
 endif
 
-CONFIGURE_COMMON := ./configure --prefix=/usr -program-prefix="relion_" 
+CONFIGURE_COMMON := ./configure --prefix=/usr \
+    --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) -program-prefix="relion_" 
 
 %:
 	dh $@ --parallel
 
-configure_serial:
-	$(CONFIGURE_COMMON) --enable-gui \
-	  CPPFLAGS="$$(fltk-config --cxxflags)" \
-	  LDFLAGS="$$(fltk-config --ldflags)" 
+override_dh_auto_configure:
 
-configure_mpi:
+override_dh_auto_build:
+	# First configure/build/install serial version
 	MPICXX=$(MPICXX) $(CONFIGURE_COMMON) --enable-mpi --disable-gui
+	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr; make clean
+	make clean
+	$(CONFIGURE_COMMON) --enable-gui \
+	  CPPFLAGS="$$(fltk-config --cxxflags)" \
+	  LDFLAGS="$$(fltk-config --ldflags)"
+	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr
 
-override_dh_configure:
-override_dh_build:
+override_dh_prep:
+	# We don't want debian/tmp to be removed again ...
+	dh_prep -X debian/tmp
 
-# Override
-override_dh_install:
+#override_dh_auto_install:
 
 describe-current-version:
 	git describe --tags upstream | sed 's,^release-,,;s,-,+,;s,-,~,;'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/relion.git