wireless-tools: Make package work on x86_64.

diff --git a/wireless-tools/wireless-tools.nm b/wireless-tools/wireless-tools.nm
index 44a5f73d40cbc779516769d37c07e1bfe12a3f5d..24387cc66326f654266c61a6fc44bf31d446cb1c 100644 (file)
--- a/wireless-tools/wireless-tools.nm
+++ b/wireless-tools/wireless-tools.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = wireless_tools
+name       = wireless-tools
 version    = 29
-release    = 1
+release    = 2
+thisapp    = wireless_tools.%{version}
 
 groups     = Networking/Wireless
 url        = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
@@ -19,8 +20,6 @@ description
        specific stats for wireless networking equipment.
 end
 
-thisapp    = %{name}.%{version}
-
 source_dl  = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
 
 build
@@ -32,13 +31,13 @@ build
        make_install_targets += \
                PREFIX=%{BUILDROOT}/usr \
                INSTALL_DIR=%{BUILDROOT}/sbin \
-               INSTALL_LIB=%{BUILDROOT}/lib \
-               INSTALL_MAN=%{BUILDROOT}/usr/share/man
+               INSTALL_LIB=%{BUILDROOT}/%{lib} \
+               INSTALL_MAN=%{BUILDROOT}%{mandir}
 
        install_cmds
-               rm -vf %{BUILDROOT}/lib/libiw.{a,so}
-               mkdir -pv %{BUILDROOT}/usr/lib
-               ln -svf ../../lib/libiw.so.%{version} %{BUILDROOT}/usr/lib/libiw.so
+               rm -vf %{BUILDROOT}/%{lib}/libiw.{a,so}
+               mkdir -pv %{BUILDROOT}%{libdir}
+               ln -svf ../../%{lib}/libiw.so.%{version} %{BUILDROOT}%{libdir}/libiw.so
        end
 end