Merge remote-tracking branch 'arne_f/automake'

[people/ms/ipfire-3.x.git] / attr / attr.nm

diff --git a/attr/attr.nm b/attr/attr.nm
index 9a6a8de59e2c0b46210d809c190336cc7bb07a34..740d88f125943e671f117925b3600d6d637861aa 100644 (file)
--- a/attr/attr.nm
+++ b/attr/attr.nm
@@ -5,7 +5,7 @@
 
 name       = attr
 version    = 2.4.43
-release    = 1
+release    = 4
 
 groups     = System/Filesystems
 url        = http://oss.sgi.com/projects/xfs/
@@ -26,34 +26,38 @@ build
        end
 
        configure_options += \
-               --bindir=/bin \
-               --enable-shared \
-               --mandir=/usr/share/man
+               --enable-shared
 
        make_build_targets += LIBTOOL="libtool --tag=CC"
 
        install_cmds
-               mkdir -pv %{BUILDROOT}/{,usr/}lib
-               install -v -m0755 %{DIR_APP}/libattr/.libs/libattr.so.1.1.0 %{BUILDROOT}/lib
-               ln -vsf libattr.so.1.1.0 %{BUILDROOT}/lib/libattr.so.1
-               ln -vsf ../../lib/libattr.so.1 %{BUILDROOT}/usr/lib/libattr.so
-               install -v -d %{BUILDROOT}/usr/include/attr
-               cp -vf %{DIR_APP}/include/{attributes.h,error_context.h,libattr.h,xattr.h} \
-                       %{BUILDROOT}/usr/include/attr/
+               # Install libraries.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               install -v -m0755 libattr/.libs/libattr.so.1.1.0 %{BUILDROOT}/%{libdir}
+               ln -vsf libattr.so.1.1.0 %{BUILDROOT}/%{libdir}/libattr.so.1
+               ln -vsf libattr.so.1 %{BUILDROOT}%{libdir}/libattr.so
+
+               # Install includes.
+               mkdir -pv %{BUILDROOT}%{includedir}/attr
+               cp -vf include/{attributes.h,error_context.h,libattr.h,xattr.h} \
+                       %{BUILDROOT}%{includedir}/attr/
        end
 end
 
 packages
        package lib%{name}
+               provides += attr=%{thisver}
        end
 
        package lib%{name}-devel
                template DEVEL
+
+               provides += attr-devel=%{thisver}
        end
 
-       package %{name}-debuginfo
+       package lib%{name}-debuginfo
                template DEBUGINFO
 
-               provides += libattr-debuginfo
+               provides += attr-debuginfo
        end
 end