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

[Peter Pearse]

Unmerged revisions

11. By Peter Pearse on 2011-03-10

For cross builds, search cross install directories, rather than system ones

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-20 17:48:39 +0000
+++ debian/changelog	2011-03-10 11:17:10 +0000
@@ -1,3 +1,10 @@
+gss (1.0.1-1ubuntu1) natty; urgency=low
+
+  * For cross builds, search cross install directories, rather than
+    system ones
+
+ -- Peter Pearse <[e-mail]>  Thu, 10 Mar 2011 11:11:55 +0000
+
 gss (1.0.1-1) unstable; urgency=low
 
   * New upstream version.

=== modified file 'debian/rules'
--- debian/rules	2010-05-20 17:48:39 +0000
+++ debian/rules	2011-03-10 11:17:10 +0000
@@ -6,7 +6,10 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-po-suffix --with-packager=Debian --with-packager-version=$(DEB_VERSION) --with-packager-bug-reports=http://bugs.debian.org/
-
+ifneq ($(cdbs_crossbuild),)
+        # Search cross install directories, rather than system ones
+        DEB_CONFIGURE_EXTRA_FLAGS += --with-libshishi-prefix=/usr/$(DEB_HOST_GNU_TYPE)
+endif
 DEB_DH_MAKESHLIBS_ARGS_libgss3 = -V'libgss3 (>= $(DEB_UPSTREAM_VERSION))'
 
 DEB_COMPRESS_EXCLUDE := gss.pdf