[adios] 160/207: FIx path

[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 26a9691f4e0bc809ad0ac84af271b568c911e379
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 16 15:56:47 2014 +0100

    FIx path
---
 debian/rules | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 925afea..a697c13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,9 +73,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) $(WITH_IBVERBS) --enable-shared \
 		--with-hdf5=/usr --with-bzip2=/usr  --with-zlib=/usr \
-		--prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS='-fPIC'
-	# Prep python wrapper. 
-	# Cache these for cmake otherwise it will get 2.7, 3.* confused
+		--prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) # CFLAGS='-fPIC'
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.
@@ -98,18 +96,19 @@ override_dh_auto_install:
 	$(MAKE) install prefix=$(DESTDIR)/usr
 	# Sort python stuff
 	mkdir -p $(TOP)/debian/tmp/usr/lib/python3/dist-packages
+	mkdir -p $(TOP)/debian/tmp/usr/lib/${PY2}/dist-packages
 	for p in $(PY3VERS); do \
 		v=`echo $$p | cut -c7,9` ;\
 		CYV=cpython-$${v}m ;\
 		mv $(TOP)/debian/tmpp/lib/$${p}/site-packages/adios.$${CYV}.so \
-			debian/tmp/usr/lib/python3/dist-packages/adios.$${CYV}-${DEB_HOST_MULTARCH}.so  ; \
+			debian/tmp/usr/lib/python3/dist-packages/adios.$${CYV}-${DEB_HOST_MULTIARCH}.so  ; \
 		mv $(TOP)/debian/tmpp/lib/$${p}/site-packages/adios_mpi.$${CYV}.so \
-			debian/tmp/usr/lib/python3/dist-packages/adios_mpi.$${CYV}-${DEB_HOST_MULTARCH}.so  ; \
+			debian/tmp/usr/lib/python3/dist-packages/adios_mpi.$${CYV}-${DEB_HOST_MULTIARCH}.so  ; \
 	done
 	mv $(TOP)/debian/tmpp/lib/${PY2}/site-packages/adios_mpi.so \
-		debian/tmp/usr/lib/${PY2}/dist-packages/adios_mpi.${DEB_HOST_MULTARCH}.so
+		debian/tmp/usr/lib/${PY2}/dist-packages/adios_mpi.${DEB_HOST_MULTIARCH}.so
 	mv $(TOP)/debian/tmpp/lib/${PY2}/site-packages/adios.so \
-		debian/tmp/usr/lib/${PY2}/dist-packages/adios.${DEB_HOST_MULTARCH}.so
+		debian/tmp/usr/lib/${PY2}/dist-packages/adios.${DEB_HOST_MULTIARCH}.so
 	rm -r debian/tmpp
 	# remove due to it not working in multi-arch;
 	rm -f  $(BINDIR)/adios_config.flags

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