Bug#914581: adios: use dh_auto_build/dh_auto_install for the C parts

[Pino Toscano]

Source: adios
Version: 1.13.1-10
Severity: wishlist
Tags: patch

Hi,

currently, the build/installation of the C components is done by
manually invoking 'make' in the build directories.  Let's just use
dh_auto_build, and dh_auto_install, so it respects more debhelper
configurations, such as the number of parallel jobs.

Thanks,
-- 
Pino

--- a/debian/rules
+++ b/debian/rules
@@ -113,10 +113,10 @@ endif
 override_dh_auto_build:
        # First do a build shared, with -fPIC, for the python lib.
 ifneq (,$(findstring $(ARCH),$(MPICHARCHS)))
-       $(MAKE) -C build-mpich CFLAGS='$(CFLAGS) -fPIC' VERBOSE=1 
+       dh_auto_build --builddirectory=build-mpich -- CFLAGS='$(CFLAGS) -fPIC' 
VERBOSE=1
 endif
 ifneq (,$(findstring $(ARCH),$(OMPIARCHS)))
-       $(MAKE) -C build-openmpi CFLAGS='$(CFLAGS) -fPIC' VERBOSE=1 
+       dh_auto_build --builddirectory=build-openmpi -- CFLAGS='$(CFLAGS) 
-fPIC' VERBOSE=1
 endif
        # Need to hack the libs into the right place, to match adios_configs 
view
        # as this is then used by setup.py
@@ -146,7 +146,7 @@ override_dh_auto_install:
        mkdir -p $(BINDIR) debian/tmp/usr/lib/python3/dist-packages 
$(DESTDIR)/usr/etc
        mkdir -p debian/tmp/usr/lib/python2.7/dist-packages
 ifneq (,$(findstring $(ARCH),$(MPICHARCHS)))
-       $(MAKE) -C build-mpich install VERBOSE=1 DESTDIR=$(TOP)/debian/tmp/mpich
+       dh_auto_install --builddirectory=build-mpich 
--destdir=$(TOP)/debian/tmp/mpich -- VERBOSE=1
        install -D -m 644  build-mpich/adios.pc 
$(TOP)/debian/tmp/$(LIBDIR)/pkgconfig/adios-mpich.pc
        for p in $(PY2VERS) $(PY3VERS) ; do \
                ( cd build-mpich/numpy && \
@@ -167,7 +167,7 @@ ifneq (,$(findstring $(ARCH),$(MPICHARCH
        cp -a debian/tmp/mpich/usr/etc/skel $(DESTDIR)/usr/etc/skel.mpich
 endif
 ifneq (,$(findstring $(ARCH),$(OMPIARCHS)))
-       $(MAKE) -C build-openmpi install  VERBOSE=1 
DESTDIR=$(TOP)/debian/tmp/openmpi
+       dh_auto_install --builddirectory=build-openmpi 
--destdir=$(TOP)/debian/tmp/openmpi -- VERBOSE=1
        install -D -m 644  build-openmpi/adios.pc 
debian/tmp/$(LIBDIR)/pkgconfig/adios-openmpi.pc
        # Sort python stuff
        for p in $(PY2VERS) $(PY3VERS) ; do \