Merge lp:~peter-pearse/ubuntu/natty/xml2/prop001 into lp:ubuntu/natty/xml2

[Peter Pearse]

Unmerged revisions

6. By Peter Pearse on 2011-04-08

Fix for cross building.

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-03 11:09:31 +0000
+++ debian/changelog	2011-04-08 14:44:27 +0000
@@ -1,3 +1,9 @@
+xml2 (0.4-3ubuntu1) natty; urgency=low
+
+  * Fix for cross building
+
+ -- Peter Pearse <[e-mail]>  Fri, 08 Apr 2011 08:54:08 +0000
+
 xml2 (0.4-3) unstable; urgency=low
 
   * Updated maintainer email address

=== modified file 'debian/rules'
--- debian/rules	2009-12-03 11:09:31 +0000
+++ debian/rules	2011-04-08 14:44:27 +0000
@@ -13,7 +13,8 @@
 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)
+    CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) 
+    CONFFLAGS += XML_CFLAGS=-I/usr/$(DEB_HOST_GNU_TYPE)/include/libxml2 XML_LIBS="-L/usr/$(DEB_HOST_GNU_TYPE)/lib/libxml2 -lxml2"
 endif
 
 CFLAGS = -Wall -g
@@ -30,14 +31,13 @@
 configure: $(QUILT_STAMPFN)
 	dh_testdir
 	autoreconf -vif
-	dh_auto_configure
-#	./configure $(CONFFLAGS) \
-#			--prefix=/usr \
-#			--mandir=\$${prefix}/share/man \
-#			--infodir=\$${prefix}/share/info \
-#			CFLAGS="$(CFLAGS)" \
-#			LDFLAGS="-Wl,-z,defs"
-#	touch $@
+	dh_auto_configure \
+		-- $(CONFFLAGS) 
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		CFLAGS="$(CFLAGS)" \
+		LDFLAGS="-Wl,-z,defs"
 
 build: configure
 	dh $@