[adios] 128/207: WIP: Another fix for mixed python3 modules

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit d18008c39e7bf4806890b0fef558b0b8502b1825
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 19 19:05:46 2014 +0100

    WIP: Another fix for mixed python3 modules
---
 debian/rules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index e3e792d..642422f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ endif
 DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 DESTDIR:=$(shell pwd)/debian/tmp
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_MULTIARCH:=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 BINDIR:=$(DESTDIR)/usr/bin
 PY2:=python2.7
@@ -71,7 +71,7 @@ override_dh_auto_configure:
 	echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$(PY2).so" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
 	echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
 	echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
-	echo "wrappers/numpy/build_$(PY2)/adios.so	/usr/lib/$(PY2)/dist-packages/adios " > debian/python-adios.install
+	echo "wrappers/numpy/build_$(PY2)/adios.so	/usr/lib/$(PY2)/dist-packages" > debian/python-adios.install
 	# And repeat for python3*
 	for p in $(PY3VERS) ; do \
 	mkdir -p wrappers/numpy/build_$$p ; \
@@ -81,7 +81,7 @@ override_dh_auto_configure:
 		echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$(p)m.so" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
 		echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
 		echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
-		echo "wrappers/numpy/build_$$p/*.so	/usr/lib/python3/dist-packages/adios" >> debian/python3-adios.install ; \
+		echo "wrappers/numpy/build_$$p/*.so	/usr/lib/python3/dist-packages" >> debian/python3-adios.install ; \
 	done
 		
 
@@ -94,8 +94,8 @@ override_dh_auto_build:
 	for p in $(PY2) $(PY3VERS) ; do \
 		( cd wrappers/numpy/build_$$p && PATH=$(TOP):$(PATH) cmake .. && $(MAKE) VERBOSE=1 ) ; done
 	for p in $(PY3VERS); do \
-		V=`echo $$p | cut -c7,8` ;\
-		mv wrappers/numpy/build_$$p/adios.so wrappers/numpy/build_$$p/adios.cpython-$$(V)m-$(DEB_HOST_MULTARCH).so ;\
+		v=`echo $$p | cut -c7,9` ;\
+		mv wrappers/numpy/build_$$p/adios.so wrappers/numpy/build_$$p/adios.cpython-$$vm-$(DEB_HOST_MULTARCH).so ;\
 	done
 	# Clean up.
 	rm -r debian/tmp/*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git