Debian package was broken: the module was directly installed

during the build process and was not in the package.
Fix that !

diff --git a/Makefile b/Makefile
index 7ac02087d4f0497afc7808a9fc2fc29cf05a6bb7..52547e337b2071af301e30ddabe731f07a6fb784 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ MODDIR        = $(DESTDIR)/lib/modules
 KVERS  = $(shell uname -r)
 KVER   = $(KVERS)
 VMODDIR = $(MODDIR)/$(KVER)
-INSTDIR        = $(VMODDIR)/kernel/drivers/misc/omnibook
+INSTDIR        = extra
 #KSRC  = /usr/src/linux
 KSRC   = $(VMODDIR)/build
 KMODDIR        = $(KSRC)/drivers/misc/omnibook
@@ -68,9 +68,10 @@ clean:
 
 
 install:       all
-               # Removing module from old location
+               # Removing module from old possible locations
                $(RM) $(VMODDIR)/kernel/drivers/char/$(MODULE_NAME).ko
-               make -C $(KSRC) M=$(PWD) modules_install
+               $(RM) $(VMODDIR)/kernel/drivers/misc/$(MODULE_NAME).ko
+               make INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=$(INSTDIR) -C $(KSRC) M=$(PWD) modules_install
 
 unload:
                $(RMMOD) $(MODULE_NAME) || :

diff --git a/debian/rules b/debian/rules
index bb43e5f53b6bdeb796695816cc7a6d22d01257e1..d9a4b5de1061f6c32f31f007d900e5222b73c668 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -85,15 +85,15 @@ build-arch-stamp:
 binary-modules: prep-deb-files
        dh_testroot
        dh_clean -k
-       dh_installdirs lib/modules/$(KVERS)/kernel/drivers/misc/omnibook
+       dh_installdirs lib/modules/$(KVERS)/extra
 
        # Build the module
        #$(MAKE) -C drivers KERNEL_DIR=$(KSRC) KVERS=$(KVERS)
        $(MAKE) KSRC=$(KSRC) KVERS=$(KVERS)
 
        # Install the module
-       $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) DEPMOD=""
-
+       $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) INSTDIR=extra DEPMOD=""
+       
        dh_installdocs
        dh_installchangelogs
        dh_compress