From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 11 Apr 2012 17:21:05 +0000 (+0200)
Subject: kmod: Move all to /usr.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4286b9f6dc0ffdc229ecd40ba0436b95cb948210;p=ipfire-3.x.git

kmod: Move all to /usr.
---

diff --git a/kmod/kmod.nm b/kmod/kmod.nm
index 180177518..8bea4577f 100644
--- a/kmod/kmod.nm
+++ b/kmod/kmod.nm
@@ -5,7 +5,7 @@
 
 name       = kmod
 version    = 7
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Kernel
@@ -30,37 +30,33 @@ build
 	end
 
 	configure_options += \
-		--bindir=/bin \
-		--with-rootprefix= \
-		--with-rootlibdir=/%{lib} \
 		--with-xz \
 		--with-zlib
 
 	# The testsuite does generate lots of errors.
 
 	install_cmds
-		# Remove all man pages (because there are not corresponding
-		# binaries, yet).
-		rm -rvf %{BUILDROOT}%{mandir}
-
-		mkdir -pv %{BUILDROOT}/lib/modprobe.d
+		mkdir -pv %{BUILDROOT}%{prefix}/lib/modprobe.d
 		mkdir -pv %{BUILDROOT}%{sysconfdir}/modprobe.d
 		mkdir -pv %{BUILDROOT}%{sysconfdir}/depmod.d
 
-		mkdir -pv %{BUILDROOT}/sbin
-		ln -svf ../bin/kmod %{BUILDROOT}/sbin/modprobe
-		ln -svf ../bin/kmod %{BUILDROOT}/sbin/modinfo
-		ln -svf ../bin/kmod %{BUILDROOT}/sbin/insmod
-		ln -svf ../bin/kmod %{BUILDROOT}/sbin/rmmod
-		ln -svf ../bin/kmod %{BUILDROOT}/sbin/depmod
-		ln -svf ../bin/kmod %{BUILDROOT}/sbin/lsmod
-		ln -svf kmod %{BUILDROOT}/bin/lsmod
+		mkdir -pv %{BUILDROOT}%{sbindir}
+		ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/modprobe
+		ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/modinfo
+		ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/insmod
+		ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/rmmod
+		ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/depmod
+		ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/lsmod
 	end
 end
 
 packages
 	package %{name}
-		provides = module-init-tools = 4.0-1
+		provides
+			module-init-tools = 4.0-1
+			/sbin/modprobe
+		end
+
 		obsoletes = module-init-tools < 4.0-1
 	end