[Pkg-voip-commits] r3619 - asterisk-addons/trunk/debian

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-05-27 12:41:08 +0000 (Sun, 27 May 2007)
New Revision: 3619

Modified:
   asterisk-addons/trunk/debian/changelog
   asterisk-addons/trunk/debian/rules
Log:
* Fix compilation on kernel arch != userland arch.


Modified: asterisk-addons/trunk/debian/changelog
===================================================================
--- asterisk-addons/trunk/debian/changelog	2007-05-27 11:46:40 UTC (rev 3618)
+++ asterisk-addons/trunk/debian/changelog	2007-05-27 12:41:08 UTC (rev 3619)
@@ -1,13 +1,14 @@
 asterisk-addons (1.4.0-1) unstable; urgency=low
 
+  [ Tzafrir Cohen ]
   * New upstream release.
   * include_asterisk.dpatch: because our asterisk.h is under asterisk/ .
   * h323_ast_extra_params.dpatch: backport a build fix from 1.4 svn.
-  * Package now has a decent makefile, so a simple 'make' and 
+  * Package now has a decent makefile, so a simple 'make' and
     'make install' work.
   * Require asterisk 1.4 .
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 23 May 2007 22:42:21 -0400
+ -- Kilian Krause <kilian at debian.org>  Sun, 27 May 2007 14:40:31 +0200
 
 asterisk-addons (1.2.5-1) UNRELEASED; urgency=low
 

Modified: asterisk-addons/trunk/debian/rules
===================================================================
--- asterisk-addons/trunk/debian/rules	2007-05-27 11:46:40 UTC (rev 3618)
+++ asterisk-addons/trunk/debian/rules	2007-05-27 12:41:08 UTC (rev 3619)
@@ -16,6 +16,16 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+
 export DH_COMPART = 4
 
 PACKEAGE:=asterisk-addons
@@ -52,7 +62,7 @@
 	if [ ! -f asterisk-ooh323c/config.h_dist ]; then \
 	  mv asterisk-ooh323c/config.h asterisk-ooh323c/config.h_dist ; \
 	fi
-	./configure
+	./configure $(confflags)
 	touch $@
 
 #Architecture