Cleanup in Makefile

Hardcode location of depmod and modprobe so sudo works even if /sbin in not in user's $PATH

diff --git a/Makefile b/Makefile
index 204421ce0c952fd4e20bf7a7a16034cd5d310990..7ac02087d4f0497afc7808a9fc2fc29cf05a6bb7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,13 +29,13 @@ KSRC        = $(VMODDIR)/build
 KMODDIR        = $(KSRC)/drivers/misc/omnibook
 KINCDIR        = $(KSRC)/include/linux
 KDOCDIR        = $(KSRC)/Documentation/omnibook
-BDIR   = $(shell pwd)
+PWD    = $(shell pwd)
 TODAY  = $(shell date +%Y%m%d)
 KERNEL = $(shell echo $(KVER) | cut -d . -f 1-2)
 
-DEPMOD = depmod -a
-RMMOD  = modprobe -r
-INSMOD = modprobe
+DEPMOD = /sbin/depmod -a
+RMMOD  = /sbin/modprobe -r
+INSMOD = /sbin/modprobe
 INSTALL        = install -m 644
 MKDIR  = mkdir -p
 RM     = rm -f
@@ -70,7 +70,7 @@ clean:
 install:       all
                # Removing module from old location
                $(RM) $(VMODDIR)/kernel/drivers/char/$(MODULE_NAME).ko
-               make -C $(KSRC) M=$(PWD) modules_install                
+               make -C $(KSRC) M=$(PWD) modules_install
 
 unload:
                $(RMMOD) $(MODULE_NAME) || :
@@ -87,7 +87,6 @@ uninstall-all:        unload
                $(DEPMOD)
 
 $(MODULE_NAME).ko:
-               PWD=$(shell pwd)
                $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
 
 kinstall:
@@ -101,7 +100,7 @@ kinstall:
                $(INSTALL) doc/README doc/README-OneTouch $(KDOCDIR)
                
 kpatch:                kinstall
-               (cd $(KSRC); patch -p1 < $(BDIR)/misc/omnibook-integration.patch)
+               (cd $(KSRC); patch -p1 < $(PWD)/misc/omnibook-integration.patch)
 
 version:       
                sed -i "s|^\(#define OMNIBOOK_MODULE_VERSION.*\)\".*\"|\1\"2.$(TODAY)\"|" omnibook.h

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 800bbafd9e733c8fc6fa3e269b0c853cf8fce3d8..9de3b75147bc662ee76f1e9247d7766d34be7737 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -7,7 +7,7 @@ Changelog file for omnibook package:
 * Add dmi info for Toshiba Satellite A105 (Thanks Mikkel L. Ellertson)
   the support is pretty minimalistic (LCD brigtness only) this
   also inaugurate ectype 14
-* Cleanup in Makefile
+* Cleanup/Fix in Makefile
 
 2.20060809 Mathieu Bérard <math_b@users.sourceforge.net>
 * Add dmi info for Toshiba Satellite M40X (Thanks Julien Valroff)