[adios] 68/207: Include skel stuff

[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 0c9e0aa864319e5b82d3d319cedbc637bf21e704
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Dec 9 18:30:35 2013 +0000

    Include skel stuff
---
 debian/libadios-bin.dirs    |  1 +
 debian/libadios-bin.install | 29 +++++++++++++++--------------
 debian/rules                | 13 ++++++++-----
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/debian/libadios-bin.dirs b/debian/libadios-bin.dirs
new file mode 100644
index 0000000..bdbbcec
--- /dev/null
+++ b/debian/libadios-bin.dirs
@@ -0,0 +1 @@
+/etc/adios/skel
diff --git a/debian/libadios-bin.install b/debian/libadios-bin.install
index 3789ce5..0014a5d 100644
--- a/debian/libadios-bin.install
+++ b/debian/libadios-bin.install
@@ -1,14 +1,15 @@
-/usr/bin/ad_config
-/usr/bin/adios_config
-/usr/bin/adios_lint
-/usr/bin/bp2bp
-/usr/bin/bp2h5
-/usr/bin/bp2ncd
-/usr/bin/bpappend
-/usr/bin/bpdump
-/usr/bin/bpgettime
-/usr/bin/bpls
-/usr/bin/bpsplit
-/usr/bin/skel_cat
-/usr/bin/skel_extract
-/usr/bin/type_mapper
+usr/bin/ad_config
+usr/bin/adios_config
+usr/bin/adios_lint
+usr/bin/bp2bp
+usr/bin/bp2h5
+usr/bin/bp2ncd
+usr/bin/bpappend
+usr/bin/bpdump
+usr/bin/bpgettime
+usr/bin/bpls
+usr/bin/bpsplit
+usr/bin/skel_cat
+usr/bin/skel_extract
+usr/bin/type_mapper
+etc/skel		/etc/adios/skel
diff --git a/debian/rules b/debian/rules
index 440799d..64db45e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,12 @@ WITH_LUSTRE :=
 #  WITH_LUSTRE:= --with-lustre=/usr
 #endif
 
-DESTDIR:=$(shell pwd)/debian/tmp/usr
 DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-BINDIR:=$(DESTDIR)/bin
+
+DESTDIR:=$(shell pwd)/debian/tmp
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
+BINDIR:=$(DESTDIR)/usr/bin
 
 
 # magic debhelper rule
@@ -40,12 +43,12 @@ override_dh_auto_clean:
 	find . -name '*.pyc' -delete
 
 override_dh_auto_configure:
-	dh_auto_configure --  $(WITH_LUSTRE) --enable-shared --prefix=`pwd`/debian/tmp  MPIFC=mpif77 CC=$(CC)
+	dh_auto_configure --  $(WITH_LUSTRE) --enable-shared --prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC)
 
 override_dh_auto_install:
-	$(MAKE) install prefix=$(DESTDIR)
+	$(MAKE) install prefix=$(DESTDIR)/usr
 	# remove due to it not working in multi-arch;
-	rm -f  $(DESTDIR)/bin/adios_config.flags
+	rm -f  $(BINDIR)/adios_config.flags
 	# renamed as per Adios CCS issue #118716, Debbug #639257
 	mv $(BINDIR)/gpp.py $(BINDIR)/adiosxml2h
 	mv $(BINDIR)/ad_config.py $(BINDIR)/ad_config

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