Merge lp:~cosmos-door/ubuntu/oneiric/policycoreutils/fix-ftbfs-832802 into lp:ubuntu/oneiric/policycoreutils

[Mitsuya Shibata]

Fix FTBFS with multi arch, see LP: #832802.

[Matthias Klose (doko)]

this is wrong. the headers can be installed for more than one architecture. use $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) for a quick hack/fix.

review: Needs Fixing

[lp:~cosmos-door/ubuntu/oneiric/policycoreutils/fix-ftbfs-832802]

31. By Mitsuya Shibata on 2011-09-25

use dpkg-architecture to detect path.

[Mitsuya Shibata (cosmos-door)]

> use $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) for a quick hack/fix.

Thank you for your review.
I pushed new code to use dpkg-architecture.

[Michael Vogt (mvo)]

This has hit the archive now:
https://launchpad.net/ubuntu/+source/policycoreutils/2.0.82-5ubuntu2:
policycoreutils | 2.0.82-5ubuntu2 | oneiric/universe | source, amd64, i386

=== modified file 'Makefile'
--- Makefile	2008-09-02 13:33:10 +0000
+++ Makefile	2011-09-25 09:31:18 +0000
@@ -1,8 +1,8 @@
 SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 
-INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
+INOTIFYH = $(shell ls /usr/include/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/sys/inotify.h 2>/dev/null)
 
-ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
+ifneq (${INOTIFYH},)
 	SUBDIRS += restorecond
 endif
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-16 19:47:17 +0000
+++ debian/changelog	2011-09-25 09:31:18 +0000
@@ -1,3 +1,10 @@
+policycoreutils (2.0.82-5ubuntu2) oneiric; urgency=low
+
+  * Fix FTBFS(LP #832802)
+    - Multiarch support in Makefile.
+
+ -- Mitsuya Shibata <[e-mail]>  Sun, 25 Sep 2011 12:11:28 +0900
+
 policycoreutils (2.0.82-5ubuntu1) natty; urgency=low
 
   * Merge from debian unstable. Remaining change: