[ode] 01/05: Using autoreconf and cleaning some vars

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository ode.

commit 7739cdc04762a830625fc4fee83edc0847ef8fe6
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Tue Oct 13 11:26:38 2015 +0200

    Using autoreconf and cleaning some vars
---
 debian/rules | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index fbd35a3..41c0bcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-EB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 # Multiarch.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -28,18 +28,19 @@ else
 	CONFIG_OPTS = --enable-double-precision
 endif
 
-CONFIG_OPTS += --prefix=/usr \
-                    --mandir=/usr/share/man \
-                    --with-libccd=system \
-		    --enable-libccd \
-                    --enable-shared \
-		    --enable-static
+CONFIG_OPTS += 	--mandir=/usr/share/man \
+                --with-libccd=system \
+		--enable-libccd \
+                --enable-shared \
+		--enable-static
 
 %:
-	dh $@ --parallel --with autotools-dev
+	dh $@ --parallel --with autoreconf
+
+override_dh_autoreconf:
+	dh_autoreconf ./bootstrap
 
 override_dh_auto_configure:
-	./bootstrap
 	dh_auto_configure -- $(CONFIG_OPTS)
 
 override_dh_auto_build:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ode.git