[adios] 05/10: Fix install paths

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository adios.

commit d8115ee6562e14a3a28c0abb05e0590ba79055ae
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 19 15:15:38 2015 +0100

    Fix install paths
---
 debian/libadios-bin.install         |  2 +-
 debian/patches/python_wrapper.patch | 24 +++++++++++++++++++++---
 debian/rules                        | 11 ++++++-----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/debian/libadios-bin.install b/debian/libadios-bin.install
index 030b966..f0bb3c3 100644
--- a/debian/libadios-bin.install
+++ b/debian/libadios-bin.install
@@ -14,5 +14,5 @@ usr/bin/skel_cat
 usr/bin/skel_extract
 usr/bin/skeldump
 usr/bin/type_mapper.py /usr/share/pyshared
-etc/skel		/etc/adios
+usr/etc/skel		/etc/adios
 debian/bash_completion.d/* /usr/share/bash-completion/completions
diff --git a/debian/patches/python_wrapper.patch b/debian/patches/python_wrapper.patch
index 6d7d51c..79c4603 100644
--- a/debian/patches/python_wrapper.patch
+++ b/debian/patches/python_wrapper.patch
@@ -1,13 +1,18 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Use adios_config in place during build and install
-Last-Updated: 2015-05-11
-Forwarded: no
+Last-Updated: 2015-05-20
+Forwarded: not-needed
 
 Index: adios-1.8.0/wrappers/numpy/setup.py
 ===================================================================
 --- adios-1.8.0.orig/wrappers/numpy/setup.py
 +++ adios-1.8.0/wrappers/numpy/setup.py
-@@ -19,13 +19,13 @@ m1 = Extension('adios',
+@@ -15,17 +15,17 @@ m1 = Extension('adios',
+                sources=['adios.cpp'], 
+                define_macros=[('_NOMPI', None)],
+                include_dirs = [np.get_include(), '../../src/public'],
+-               library_dirs = [],
++               library_dirs = ['../../debian/tmp/usr/lib'],
                 libraries = [],
                 extra_objects = [])
  
@@ -37,3 +42,16 @@ Index: adios-1.8.0/Makefile.am
 +	#$(INSTALL_DATA) adios_git_status $(DESTDIR)$(sysconfdir)
          
  CLEANFILES = adios_config adios_config.flags
+Index: adios-1.8.0/wrappers/numpy/setup_mpi.py
+===================================================================
+--- adios-1.8.0.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.8.0/wrappers/numpy/setup_mpi.py
+@@ -15,7 +15,7 @@ m1 = Extension('adios_mpi',
+                sources=['adios_mpi.cpp'], 
+                define_macros=[],
+                include_dirs = [np.get_include(), '../../src/public'],
+-               library_dirs = [],
++               library_dirs = ['../../debian/tmp/usr/lib'],
+                libraries = [],
+                extra_objects = [])
+ 
diff --git a/debian/rules b/debian/rules
index a57c21f..d754ea6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
+# export DH_VERBOSE=1
 
 ARCH:=$(shell dpkg --print-architecture)
 WITH_IBVERBS:= --with-ibverbs=/usr
@@ -61,9 +61,10 @@ LIBS=' -lpthread'
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.
-	$(MAKE) -C src CFLAGS='-fPIC' VERBOSE=1 install
+	$(MAKE) -C src CFLAGS='-fPIC' VERBOSE=1 install DESTDIR=$(DESTDIR)
 	# Need to hack the libs into the right place, to match adios_configs view
-	mv debian/tmp/lib/*/*.a debian/tmp/lib
+	# as this is then used by setup.py
+	mv debian/tmp/usr/lib/*/*.a debian/tmp/usr/lib
 	# Now build Python wrapper. Uses adios_config and the debian/tmp install.
 	chmod +x adios_config
 	for p in ${PY2VERS} ${PY3VERS} ; do \
@@ -77,8 +78,8 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	find . -name .gitignore -delete
-	$(MAKE) install $(DESTDIR)/usr
-	install -D -m 644  adios.pc $(TOP)/debian/tmp/$(LIBDIR)/pkgconfig
+	$(MAKE) install DESTDIR=$(DESTDIR)
+	install -D -m 644  adios.pc $(TOP)/debian/tmp/$(LIBDIR)/pkgconfig/adios.pc
 	# Sort python stuff
 	mkdir -p $(TOP)/debian/tmp/usr/lib/python3/dist-packages
 	mkdir -p $(TOP)/debian/tmp/usr/lib/${PY2VERS}/dist-packages

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