Merge remote-tracking branch 'ms/openvswitch'

[ipfire-3.x.git] / zlib / zlib.nm

diff --git a/zlib/zlib.nm b/zlib/zlib.nm
index f1611f4358224b569801510f88239cd676b56bd8..173768722375beab01a3dff63802fc333d0376b8 100644 (file)
--- a/zlib/zlib.nm
+++ b/zlib/zlib.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = zlib
-version    = 1.2.5
+version    = 1.2.7
 release    = 1
 
 groups     = System/Libraries
@@ -24,28 +24,27 @@ CFLAGS    += -fPIC -DPIC
 
 build
        configure_options = \
-               --prefix=/usr \
-               --libdir=/lib
+               --prefix=%{prefix} \
+               --libdir=%{libdir}
 
        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
-
-               mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
+               mkdir -pv %{BUILDROOT}%{includedir} %{BUILDROOT}%{libdir}
+               cp -pfv zconf.h zlib.h %{BUILDROOT}%{includedir}
        end
 end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-devel
                template DEVEL
        end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
 end