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

popt: Make package work on x86_64.
---

diff --git a/popt/popt.nm b/popt/popt.nm
index 9407ce2da..5bf894aac 100644
--- a/popt/popt.nm
+++ b/popt/popt.nm
@@ -5,7 +5,7 @@
 
 name       = popt
 version    = 1.15
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.rpm5.org/
@@ -22,18 +22,17 @@ source_dl  =
 
 build
 	configure_options += \
-		--libdir=/lib \
+		--libdir=/%{lib}
 
 	install_cmds
-		mkdir -pv %{BUILDROOT}/usr/lib
-		rm -vf %{BUILDROOT}/lib/libpopt.so
-		ln -sfv ../../lib/libpopt.so.0.0.0 %{BUILDROOT}/usr/lib/libpopt.so
+		mkdir -pv %{BUILDROOT}%{libdir}
+		rm -vf %{BUILDROOT}/%{lib}/libpopt.so
+		ln -sfv ../../%{lib}/libpopt.so.0.0.0 %{BUILDROOT}%{libdir}/libpopt.so
 	end
 end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-devel
 		template DEVEL