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

zlib: Make package work on x86_64.
---

diff --git a/zlib/zlib.nm b/zlib/zlib.nm
index d65d2f8a7..08d9f4f56 100644
--- a/zlib/zlib.nm
+++ b/zlib/zlib.nm
@@ -5,7 +5,7 @@
 
 name       = zlib
 version    = 1.2.5
-release    = 2
+release    = 3
 
 groups     = System/Libraries
 url        = http://www.gzip.org/zlib/
@@ -24,20 +24,20 @@ CFLAGS    += -fPIC -DPIC
 
 build
 	configure_options = \
-		--prefix=/usr \
-		--libdir=/lib
+		--prefix=%{prefix} \
+		--libdir=/%{lib}
 
 	test
 		make check
 	end
 
 	install_cmds
-		mkdir -pv %{BUILDROOT}/usr/{include,lib}
-		cp -pfv zconf.h zlib.h %{BUILDROOT}/usr/include
-		rm -vf %{BUILDROOT}/lib/libz.so
-		ln -sfv ../../lib/libz.so.%{version} %{BUILDROOT}/usr/lib/libz.so
+		mkdir -pv %{BUILDROOT}%{includedir} %{BUILDROOT}%{libdir}
+		cp -pfv zconf.h zlib.h %{BUILDROOT}%{includedir}
+		rm -vf %{BUILDROOT}/%{lib}/libz.so
+		ln -sfv ../../%{lib}/libz.so.%{version} %{BUILDROOT}%{libdir}/libz.so
 
-		mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
+		mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
 	end
 end