From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 Apr 2012 22:37:10 +0000 (+0200)
Subject: zlib: Move libs to /usr.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b17bc813a00623d4befdf19397a587c507d26ac;p=ipfire-3.x.git

zlib: Move libs to /usr.
---

diff --git a/zlib/zlib.nm b/zlib/zlib.nm
index 5e989317c..78b0815fe 100644
--- a/zlib/zlib.nm
+++ b/zlib/zlib.nm
@@ -5,7 +5,7 @@
 
 name       = zlib
 version    = 1.2.6
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.gzip.org/zlib/
@@ -25,7 +25,7 @@ CFLAGS    += -fPIC -DPIC
 build
 	configure_options = \
 		--prefix=%{prefix} \
-		--libdir=/%{lib}
+		--libdir=%{libdir}
 
 	test
 		make check
@@ -34,10 +34,6 @@ build
 	install_cmds
 		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}%{libdir}
 	end
 end