From d8cff3d019c7cd14f17a57db1f1f918263848f1a Mon Sep 17 00:00:00 2001 From: Frodo Looijaard Date: Sun, 9 Jul 2000 20:37:13 +0000 Subject: [PATCH] MODDIR changes, as promised git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@840 7894878c-1315-0410-8ee3-d5d059ff63e0 --- INSTALL | 24 +++--------------------- Makefile | 4 ++-- QUICKSTART | 5 ----- 3 files changed, 5 insertions(+), 28 deletions(-) diff --git a/INSTALL b/INSTALL index 56c51e98..7fa486ec 100644 --- a/INSTALL +++ b/INSTALL @@ -137,7 +137,7 @@ out by itself their settings, but it is possible to overrule them. A list is found below. Most important are the variables that determine where your kernel is located (LINUX=/usr/src/linux), where the i2c header files are (I2C_HEADERS=/usr/local/include) and where you want to install -your modules (MODDIR=/lib/modules/KERNELVERSION/extra/misc) and +your modules (MODDIR=/lib/modules/KERNELVERSION/misc) and header files (LINUX_INCLUDE_DIR=/usr/local/include/linux). You can see that the installation locations are choosen in such a way that they are separate from the true kernel. @@ -193,7 +193,7 @@ DEBUG default: 0 so by the lm_sensors team. PREFIX default: /usr/local Prefix for almost all installation directories -MODDIR default: /lib/modules/KERNELVERSION/extra/misc) +MODDIR default: /lib/modules/KERNELVERSION/misc) The location where the kernel modules will be installed. ETCDIR default: /etc Installation location of the sensors.conf configuration file @@ -221,25 +221,7 @@ MANGRP default: root Handling the modules (compilation option 1) =========================================== -Once you have installed the kernel modules, you will have to make sure -they are found. - -First, check whether your modutils will look in the right directory at -all. If you used build system 1, you will probably have to add lines -to /etc/conf.modules or /etc/modules.conf (use the one that exists, or -take your pick): - (modules-2.0.0): - path[misc]=/lib/modules/current/extra/misc - (modutils-2.1.x): - path=/lib/modules/current/extra -This assumes /lib/modules/current will always be linked to the correct -modules tree. If not, you will have to change it as appropriate for -your system. - -You may also have to add all default paths to this file. You can get -a list of them by doing a `modprobe -c', before and after your changes. - -Next, you will have to run `depmod -a' to have them recognised. Most +Run the command `depmod -a' to have the new modules recognised. Most distributions run this command when you boot, so if you were cross- compiling, you can skip this step. diff --git a/Makefile b/Makefile index 6369cb38..d2093b05 100644 --- a/Makefile +++ b/Makefile @@ -79,8 +79,8 @@ PREFIX := /usr/local # This is the directory into which the modules will be installed. # The magic invocation will return something like this: -# /lib/modules/2.2.15-ac9/extra/misc -MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/extra/misc +# /lib/modules/2.2.15-ac9/misc +MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc # This is the directory where sensors.conf will be installed, if no other # configuration file is found diff --git a/QUICKSTART b/QUICKSTART index 6aa8978a..706e166c 100644 --- a/QUICKSTART +++ b/QUICKSTART @@ -13,11 +13,6 @@ Quickstart: kernel or available as a module somewhere. * Do a `make' followed by a `make install'. The warnings about .d files at the start are harmless. - * Add the line - path=/lib/modules/current/extra - to /etc/conf.modules or /etc/modules.conf (whichever one exists) - if it is not there yet. Depending on your version of modutils, - you may have to add all default paths to it too. * Do a `depmod -a'. * Add the line /usr/local/lib