From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Jan 2012 15:01:34 +0000 (+0100)
Subject: cryptsetup-luks: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc3a4d27ccecd1ad442e840b4c7d9c8de15d5562;p=ipfire-3.x.git

cryptsetup-luks: Make package work on x86_64.
---

diff --git a/cryptsetup-luks/cryptsetup-luks.nm b/cryptsetup-luks/cryptsetup-luks.nm
index 8ac430276..0fbad7561 100644
--- a/cryptsetup-luks/cryptsetup-luks.nm
+++ b/cryptsetup-luks/cryptsetup-luks.nm
@@ -5,7 +5,7 @@
 
 name       = cryptsetup-luks
 version    = 1.1.0
-release    = 1
+release    = 2
 
 groups     = System/Filesystems
 url        = http://cryptsetup.googlecode.com/
@@ -33,20 +33,19 @@ build
 
 	configure_options += \
 		--sbindir=/sbin \
-		--libdir=/lib \
+		--libdir=/%{lib} \
 		--disable-static
 
 	install_cmds
-		rm -rvf %{BUILDROOT}/lib/cryptsetup{,.la,.so}
-		mkdir -pv %{BUILDROOT}/usr/lib
-		mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
-		ln -svf ../../lib/libcryptsetup.so.1 %{BUILDROOT}/usr/lib/libcryptsetup.so
+		rm -rvf %{BUILDROOT}/%{lib}/cryptsetup{,.la,.so}
+		mkdir -pv %{BUILDROOT}%{libdir}
+		mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
+		ln -svf ../../%{lib}/libcryptsetup.so.1 %{BUILDROOT}%{libdir}/libcryptsetup.so
 	end
 end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-devel
 		template DEVEL