pakfire: Sync to upstream version.

[people/amarx/ipfire-3.x.git] / ustr / ustr.nm

diff --git a/ustr/ustr.nm b/ustr/ustr.nm
index a8e8eb917f8fea716388c5c33e88e318e6099ea7..be7d74132125c15dfc672236a12c33c2d438cf58 100644 (file)
--- a/ustr/ustr.nm
+++ b/ustr/ustr.nm
@@ -5,7 +5,7 @@
 
 name       = ustr
 version    = 1.0.4
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.and.org/ustr/
@@ -28,27 +28,23 @@ build
                make check
        end
 
+       make_install_targets += libdir=%{libdir}
+
        install_cmds
                rm -rf %{BUILDROOT}/usr/share
-               rm -rf %{BUILDROOT}/usr/lib/pkgconfig/*debug*
+               rm -rf %{BUILDROOT}/usr/lib*/pkgconfig/*debug*
                rm -rf %{BUILDROOT}/lib/*debug*
-               rm -rf %{BUILDROOT}/usr/lib/*debug*
+               rm -rf %{BUILDROOT}/usr/lib*/*debug*
        end
 end
 
 packages
        package %{name}
-       end
 
        package %{name}-devel
                template DEVEL
 
-               files
-                       /usr/bin/
-                       /usr/include/
-                       /usr/lib/pkgconfig/
-                       */lib/*.so
-               end
+               files += %{bindir}
        end
 
        package %{name}-debuginfo