From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Dec 2011 17:12:24 +0000 (+0100)
Subject: libselinux: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6375510238e00e5fa812b27cb6a2edd40ab4f9f;p=ipfire-3.x.git

libselinux: Make package work on x86_64.
---

diff --git a/libselinux/libselinux.nm b/libselinux/libselinux.nm
index 6e4811421..dbd857a1d 100644
--- a/libselinux/libselinux.nm
+++ b/libselinux/libselinux.nm
@@ -5,7 +5,7 @@
 
 name       = libselinux
 version    = 2.0.96
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.selinuxproject.org
@@ -30,13 +30,16 @@ build
 
 	build
 		make clean
-		make CC=gcc LIBDIR="/usr/lib" CFLAGS="-g %{CFLAGS}" swigify
-		make CC=gcc LIBDIR="/usr/lib" CFLAGS="-g %{CFLAGS}" all
-		make CC=gcc LIBDIR="/usr/lib" CFLAGS="-g %{CFLAGS}" pywrap
+		make CC=gcc LIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" swigify
+		make CC=gcc LIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" all
+		make CC=gcc LIBDIR="%{libdir}" CFLAGS="-g %{CFLAGS}" pywrap
 	end
 
+	make_install_targets += LIBDIR="%{BUILDROOT}%{libdir}" \
+		SHLIBDIR="%{BUILDROOT}/%{lib}"
+
 	install_cmds
-		make install-pywrap DESTDIR=%{BUILDROOT}
+		make install-pywrap DESTDIR=%{BUILDROOT} LIBDIR="%{BUILDROOT}%{libdir}"
 
 		# Remove unwanted binaries
 		rm -f %{BUILDROOT}/usr/sbin/compute_*