Merge remote-tracking branch 'arne_f/autoconf'

[people/arne_f/ipfire-3.x.git] / dmraid / dmraid.nm

diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm
index 9a43c0b513e2855e5de722d0f55198d427a1b116..f0fbf1755fc6fd4a42a7129e1810457e812b9060 100644 (file)
--- a/dmraid/dmraid.nm
+++ b/dmraid/dmraid.nm
@@ -5,7 +5,7 @@
 
 name       = dmraid
 version    = 1.0.0.rc15
-release    = 2
+release    = 4
 
 groups     = System/Filesystems
 url        = http://people.redhat.com/heinzm/sw/dmraid
@@ -30,11 +30,9 @@ build
        DIR_APP = %{DIR_SRC}/%{name}/%{version}
        PARALLELISMFLAGS = # Disabled
 
-       make_install_targets += sbindir=%{BUILDROOT}/sbin
+       make_install_targets += sbindir=%{BUILDROOT}%{sbindir}
 
        configure_options += \
-               --sbindir=/sbin \
-               --libdir=/lib \
                --disable-static \
                --disable-static_link \
                --enable-libselinux
@@ -44,19 +42,14 @@ build
        end
 
        install_cmds
-               mkdir -pv %{BUILDROOT}/{,usr}/lib
-               install -v -m 755 lib/libdmraid.so \
-                       %{BUILDROOT}/lib/libdmraid.so.%{version}
-               ln -svf ../../lib/libdmraid.so.%{version} %{BUILDROOT}/usr/lib/libdmraid.so
-
                # Install development headers.
-               install -m 644 include/dmraid/*.h %{BUILDROOT}/usr/include/dmraid/
+               mkdir -pv %{BUILDROOT}%{includedir}/dmraid
+               install -m 644 include/dmraid/*.h %{BUILDROOT}%{includedir}/dmraid/
        end
 end
 
 packages
        package %{name}
-       end
 
        package %{name}-devel
                template DEVEL