1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
|
Cleanup to not loose the user-specified version string and blindly try include
modversions.h
By: Eduard Bloch <blade@debian.org>
Index: sl-modem-2.9.11~20090222/Makefile
===================================================================
--- sl-modem-2.9.11~20090222.orig/Makefile 2008-03-29 14:04:16.000000000 +0200
+++ sl-modem-2.9.11~20090222/Makefile 2009-02-26 08:37:16.000000000 +0200
@@ -13,11 +13,15 @@
#
###########################################################################
-KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
+KERNEL_DIR?=/lib/modules/$(shell uname -r)/build
# tools
INSTALL:=install
-
+# Definitions
+MODULES_DIR = /lib/modules/$(KVERS)/misc
+MODEM_DEV := ttySL0
+MODEM_LINK := modem
+MODULES_CONF:= /etc/modules.conf
all: modem
modem:
Index: sl-modem-2.9.11~20090222/drivers/Makefile
===================================================================
--- sl-modem-2.9.11~20090222.orig/drivers/Makefile 2009-02-23 00:20:58.000000000 +0200
+++ sl-modem-2.9.11~20090222/drivers/Makefile 2009-02-26 08:37:16.000000000 +0200
@@ -45,8 +45,14 @@
ifndef KERNELRELEASE
ifndef KERNEL_VER
+
+KVERS?=$(shell ./kernel-ver)
+
+
+
all install uninstall: kernel-ver
- $(MAKE) $@ KERNEL_VER=$(shell ./kernel-ver)
+ $(MAKE) $@ KERNEL_VER=$(KVERS)
+# $(MAKE) $@ KERNEL_VER=$(shell ./kernel-ver)
install: install-devices
uninstall: remove-devices
@@ -80,9 +86,9 @@
slusb-objs:= old_st7554.o
obj:=.
-module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc
+module-dir ?= ${DESTDIR}/lib/modules/$(KERNEL_VER)/misc
-CFLAGS:= -Wall -pipe -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include $(FOUND_CLASS_SIMPLE)
+CFLAGS:= -Wall -pipe -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB `test -f $(KERNEL_DIR)/include/linux/modversions.h && echo -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include` $(FOUND_CLASS_SIMPLE)
all: $(obj-m)
|