[adios] 55/207: WIP: put files in debian/tmp

[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 c0077c500e6ba10d8ddcf0d72d7e074ee430576c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Oct 24 12:16:26 2013 +0100

    WIP: put files in debian/tmp
---
 debian/rules | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6fed9a2..f6ef53e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ WITH_LUSTRE :=
 #  WITH_LUSTRE:= --with-lustre=/usr
 #endif
 
-BINDIR=debian/libadios-dev/usr/bin
+DESTDIR:=$(shell pwd)/debian/tmp/usr
 DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 # magic debhelper rule
@@ -41,11 +41,10 @@ override_dh_auto_configure:
 	dh_auto_configure --  $(WITH_LUSTRE) --enable-shared --prefix=`pwd`/debian/tmp  MPIFC=mpif77 CC=$(CC)
 
 override_dh_auto_install:
-	$(MAKE) install prefix=$(shell pwd)/debian/libadios-dev/usr 
+	$(MAKE) install prefix=$(DESTDIR)
 	# remove due to it not working in multi-arch;
-	rm -f  $(BINDIR)/adios_config.flags
+	rm -f  $(DESTDIR)/bin/adios_config.flags
 	# renamed as per Adios CCS issue #118716, Debbug #639257
-	mv $(BINDIR)/gpp.py $(BINDIR)/adiosxml2h
-	cp debian/adios_config $(BINDIR)/adios_config
-	mv $(BINDIR)/gpp_types.py $(BINDIR)/gpp_types
-	mv $(BINDIR)/xmlparser.py $(BINDIR)/xmlparser
+	#mv $(BINDIR)/gpp.py $(BINDIR)/adiosxml2h
+	cp debian/adios_config $(DESTDIR)/usr/bin/adios_config
+	mv $(DESTDIR)/bin/xmlparser.py $(DESTDIR)/bin/xmlparser

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