summaryrefslogtreecommitdiff
blob: ce1aa30a9f864a0083d0d5b56be25f458cda6be8 (plain)
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
58
59
60
61
62
63
64
65
66
67
68
69
70
diff -urp lm_sensors-2.10.0/kernel/busses/Module.mk lm_sensors-2.10.0-module-path/kernel/busses/Module.mk
--- lm_sensors-2.10.0/kernel/busses/Module.mk	2005-04-14 17:24:28.000000000 +0200
+++ lm_sensors-2.10.0-module-path/kernel/busses/Module.mk	2006-02-15 17:59:38.000000000 +0100
@@ -108,16 +108,16 @@ all :: all-kernel-busses
 
 #
 # If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory
-# layout, so we install in kernel/drivers/i2c/busses and remove old versions in misc/
-# and kernel/drivers/i2c/ . Otherwise we install in misc/ as before.
+# layout, so we install in drivers/i2c/busses and remove old versions in misc/
+# and drivers/i2c/ . Otherwise we install in misc/ as before.
 #
 install-kernel-busses: all-kernel-busses
 	if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \
-	  $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
-	  $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
+	  $(MKDIR) $(DESTDIR)$(MODPREF)/drivers/i2c/busses ; \
+	  $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/drivers/i2c/busses ; \
 	  for i in $(KERNELBUSSESTARGETS) ; do \
-	    $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i` \
-	          $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses/`basename $$i`.gz ; \
+	    $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/drivers/i2c/`basename $$i` \
+	          $(DESTDIR)$(MODPREF)/drivers/i2c/`basename $$i`.gz $(DESTDIR)$(MODPREF)/drivers/i2c/busses/`basename $$i`.gz ; \
 	  done ; \
 	  $(RMDIR) $(DESTDIR)$(MODPREF)/misc 2> /dev/null || true ; \
 	fi
diff -urp lm_sensors-2.10.0/kernel/chips/Module.mk lm_sensors-2.10.0-module-path/kernel/chips/Module.mk
--- lm_sensors-2.10.0/kernel/chips/Module.mk	2006-02-15 02:46:47.000000000 +0100
+++ lm_sensors-2.10.0-module-path/kernel/chips/Module.mk	2006-02-15 17:59:38.000000000 +0100
@@ -191,13 +191,13 @@ all :: all-kernel-chips
 
 #
 # If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory
-# layout, so we install in kernel/drivers/i2c/chips/ and remove old versions in misc/
+# layout, so we install in drivers/i2c/chips/ and remove old versions in misc/
 # and kernel/drivers/sensors/ . Otherwise we install in misc/ as before.
 #
 install-kernel-chips: all-kernel-chips
 	if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
-	  $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
-	  $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
+	  $(MKDIR) $(DESTDIR)$(MODPREF)/drivers/i2c/chips ; \
+	  $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/drivers/i2c/chips ; \
 	  for i in $(KERNELCHIPSTARGETS) ; do \
 	    $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i` \
 	          $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i`.gz $(DESTDIR)$(MODPREF)/kernel/drivers/chips/`basename $$i`.gz ; \
Only in lm_sensors-2.10.0-module-path/kernel/chips: Module.mk.orig
diff -urp lm_sensors-2.10.0/prog/hotplug/Makefile.p4b lm_sensors-2.10.0-module-path/prog/hotplug/Makefile.p4b
--- lm_sensors-2.10.0/prog/hotplug/Makefile.p4b	2003-05-31 19:30:47.000000000 +0200
+++ lm_sensors-2.10.0-module-path/prog/hotplug/Makefile.p4b	2006-02-15 17:59:38.000000000 +0100
@@ -44,15 +44,15 @@ OBJS = p4b_smbus.o
 all: $(OBJS)
 
 install: all
-	install -d /lib/modules/$(KERNELVERSION)/kernel/drivers/i2c/busses
-	install -c p4b_smbus.o /lib/modules/$(KERNELVERSION)/kernel/drivers/i2c/busses
+	install -d /lib/modules/$(KERNELVERSION)/drivers/i2c/busses
+	install -c p4b_smbus.o /lib/modules/$(KERNELVERSION)/drivers/i2c/busses
 #	test ! -x /dev/watchdog || mknod -m 600 /dev/watchdog c 10 130
 #	test ! -x /dev/temperature || mknod -m 600 /dev/temperature c 10 131
 
 inst: all
 	rmmod p4b_smbus
-	install -d /lib/modules/$(KERNELVERSION)/kernel/drivers/i2c/busses
-	install -c p4b_smbus.o /lib/modules/$(KERNEL)/kernel/drivers/i2c/busses
+	install -d /lib/modules/$(KERNELVERSION)/drivers/i2c/busses
+	install -c p4b_smbus.o /lib/modules/$(KERNEL)/drivers/i2c/busses
 	depmod -a
 #	modprobe p4b_smbus