[cmor-tables] 81/83: Build fixes

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository cmor-tables.

commit 7ff978899723b0b4d9c967b04d3263d72bc61588
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 29 10:16:54 2013 +0100

    Build fixes
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/rules     | 16 +++++++++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b90623..81eb7bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ cmip5-cmor-tables (1.3.13-1) unstable; urgency=low
   * New upstream release.
   * Standards-Version: 3.9.4. No changes required.
   * Moved to debhelper level 9.
+  * Now need autotools-dev for config.sub
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 29 Jul 2013 09:40:02 +0100
 
diff --git a/debian/control b/debian/control
index e7f623e..dffc36b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cmip5-cmor-tables
 Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), autotools-dev
 Standards-Version: 3.9.4
 Homepage:  http://www2-pcmdi.llnl.gov/cmor
 Vcs-Git: http://uv-cdat.llnl.gov/git/cmip5-cmor-tables.git
diff --git a/debian/rules b/debian/rules
index 08b7fba..54cfe91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,19 @@ export DH_VERBOSE=1
 
 # magic debhelper rule
 %:
-	dh $@
+	dh $@ 
 
-dh_auto_clean:
-	rm -f config.guess config.status
-	dh_clean
+override_dh_auto_clean:
+	rm -f config.guess config.status config.log Makefile config.sub
+	dh_auto_clean
+
+override_dh_auto_configure:
+	cp /usr/share/misc/config.guess .
+	cp /usr/share/misc/config.sub .
+	dh_auto_configure -- --prefix=`pwd`/debian/tmp/usr
 
 override_dh_auto_install:
 	dh_auto_install
-	mkdir -p debian/cmip5-cmor-tables/usr/share/cmor_csv
+	mkdir -p debian/cmip5-cmor-tables/usr/share/cmor_csv debian/cmip5-cmor-tables/usr/share/cmor
 	cp Tables_csv/* debian/cmip5-cmor-tables/usr/share/cmor_csv
+	cp Tables/* debian/cmip5-cmor-tables/usr/share/cmor

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