[med-svn] [relion] 14/36: d/rules: Install different versions to different dirs

[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 4e7fb148a03b81194182430b8cdbe15b66f19257
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Fri Oct 10 23:17:09 2014 +0000

    d/rules: Install different versions to different dirs
---
 debian/rules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3959d15..c4a5705 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,13 +28,13 @@ override_dh_auto_build:
 	$(CONFIGURE_COMMON) --enable-gui \
 	  CPPFLAGS="$$(fltk-config --cxxflags)" \
 	  LDFLAGS="$$(fltk-config --ldflags)"
-	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr; make clean
-	# ... then clitools ...
-	$(CONFIGURE_COMMON) --disable-gui
-	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr; make clean
+	make -j 6; make install prefix=$(CURDIR)/debian/tmp/gui/usr; make clean
 	# ... then mpitools ...
 	MPICXX=$(MPICXX) $(CONFIGURE_COMMON) --enable-mpi --disable-gui
-	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr
+	make -j 6; make install prefix=$(CURDIR)/debian/tmp/mpi/usr; make clean
+	# ... then clitools ...
+	$(CONFIGURE_COMMON) --disable-gui
+	make -j 6; make install prefix=$(CURDIR)/debian/tmp/serial/usr
 
 override_dh_prep:
 	# We don't want debian/tmp to be removed again ...

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