From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Dec 2011 13:46:42 +0000 (+0100)
Subject: libidn: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8988c7e14bba2fc2dbd4322fd13e4d3ab3b7ea7b;p=ipfire-3.x.git

libidn: Make package work on x86_64.
---

diff --git a/libidn/libidn.nm b/libidn/libidn.nm
index 7de885f7c..194192029 100644
--- a/libidn/libidn.nm
+++ b/libidn/libidn.nm
@@ -5,7 +5,7 @@
 
 name       = libidn
 version    = 1.22
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.gnu.org/software/libidn/
@@ -23,7 +23,7 @@ source_dl  =
 
 build
 	configure_options += \
-		--libdir=/lib \
+		--libdir=/%{lib} \
 		--disable-csharp \
 		--disable-static
 
@@ -33,17 +33,16 @@ build
 
 	install
 		make install DESTDIR=%{BUILDROOT} \
-			pkgconfigdir=/usr/lib/pkgconfig
+			pkgconfigdir=%{libdir}/pkgconfig
 
-		mkdir -pv %{BUILDROOT}/usr/lib
-		rm -vf %{BUILDROOT}/lib/libidn.so
-		ln -svf ../../lib/libidn.so.11.6.5 %{BUILDROOT}/usr/lib/libidn.so
+		mkdir -pv %{BUILDROOT}%{libdir}
+		rm -vf %{BUILDROOT}/%{lib}/libidn.so
+		ln -svf ../../%{lib}/libidn.so.11.6.5 %{BUILDROOT}%{libdir}/libidn.so
 	end
 end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-devel
 		template DEVEL