]>
Commit | Line | Data |
---|---|---|
beb2cb42 JR |
1 | diff -urN lm_sensors-2.5.2.orig/Makefile lm_sensors-2.5.2/Makefile |
2 | --- lm_sensors-2.5.2.orig/Makefile Sun Jul 9 22:37:13 2000 | |
3 | +++ lm_sensors-2.5.2/Makefile Fri Sep 15 23:16:35 2000 | |
4 | @@ -157,7 +157,8 @@ | |
5 | # create non-kernel object files (which are linked into executables). | |
6 | # ARCFLAGS are used to create archive object files (static libraries), and | |
7 | # LIBCFLAGS are for shared library objects. | |
8 | -CFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS) -O2 | |
9 | +OPTS=-O2 | |
10 | +CFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS) $(OPTS) | |
11 | ||
12 | ifeq ($(DEBUG),1) | |
13 | CFLAGS += -DDEBUG | |
14 | diff -urN lm_sensors-2.5.2.orig/etc/Module.mk lm_sensors-2.5.2/etc/Module.mk | |
15 | --- lm_sensors-2.5.2.orig/etc/Module.mk Fri Dec 24 20:52:27 1999 | |
16 | +++ lm_sensors-2.5.2/etc/Module.mk Fri Sep 15 23:12:05 2000 | |
17 | @@ -28,9 +28,8 @@ | |
18 | ||
19 | install-etc: | |
20 | $(MKDIR) $(DESTDIR)$(ETCDIR) | |
21 | - if [ ! -e $(DESTDIR)$(ETCINSTALL) ] ; then \ | |
22 | - $(INSTALL) -o root -g root -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \ | |
23 | - fi | |
24 | + $(INSTALL) -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL) | |
25 | + | |
26 | install :: install-etc | |
27 | ||
28 | # No clean rule | |
29 | diff -urN lm_sensors-2.5.2.orig/kernel/Module.mk lm_sensors-2.5.2/kernel/Module.mk | |
30 | --- lm_sensors-2.5.2.orig/kernel/Module.mk Mon Jan 3 01:32:38 2000 | |
31 | +++ lm_sensors-2.5.2/kernel/Module.mk Fri Sep 15 23:12:28 2000 | |
32 | @@ -37,7 +37,7 @@ | |
33 | install-kernel: all-kernel | |
34 | if [ -n "$(KERNELTARGETS)" ] ; then \ | |
35 | $(MKDIR) $(DESTDIR)$(MODDIR) ; \ | |
36 | - $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\ | |
37 | + $(INSTALL) -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\ | |
38 | fi | |
39 | install :: install-kernel | |
40 | ||
41 | diff -urN lm_sensors-2.5.2.orig/kernel/busses/Module.mk lm_sensors-2.5.2/kernel/busses/Module.mk | |
42 | --- lm_sensors-2.5.2.orig/kernel/busses/Module.mk Tue May 23 03:33:13 2000 | |
43 | +++ lm_sensors-2.5.2/kernel/busses/Module.mk Fri Sep 15 23:12:56 2000 | |
44 | @@ -54,7 +54,7 @@ | |
45 | install-kernel-busses: all-kernel-busses | |
46 | if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \ | |
47 | $(MKDIR) $(DESTDIR)$(MODDIR) ; \ | |
48 | - $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODDIR) ; \ | |
49 | + $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODDIR) ; \ | |
50 | fi | |
51 | ||
52 | install :: install-kernel-busses | |
53 | diff -urN lm_sensors-2.5.2.orig/kernel/chips/Module.mk lm_sensors-2.5.2/kernel/chips/Module.mk | |
54 | --- lm_sensors-2.5.2.orig/kernel/chips/Module.mk Thu May 11 03:35:22 2000 | |
55 | +++ lm_sensors-2.5.2/kernel/chips/Module.mk Fri Sep 15 23:12:47 2000 | |
56 | @@ -69,7 +69,7 @@ | |
57 | install-kernel-chips: all-kernel-chips | |
58 | if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \ | |
59 | $(MKDIR) $(DESTDIR)$(MODDIR) ; \ | |
60 | - $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODDIR) ;\ | |
61 | + $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODDIR) ;\ | |
62 | fi | |
63 | ||
64 | install :: install-kernel-chips | |
65 | diff -urN lm_sensors-2.5.2.orig/kernel/include/Module.mk lm_sensors-2.5.2/kernel/include/Module.mk | |
66 | --- lm_sensors-2.5.2.orig/kernel/include/Module.mk Mon Jan 3 01:32:38 2000 | |
67 | +++ lm_sensors-2.5.2/kernel/include/Module.mk Fri Sep 15 23:12:37 2000 | |
68 | @@ -32,7 +32,7 @@ | |
69 | install-all-kernel-include: | |
70 | if [ -n "$(KERNELINCLUDEFILES)" ] ; then \ | |
71 | $(MKDIR) $(DESTDIR)$(SYSINCLUDEDIR) ; \ | |
72 | - $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \ | |
73 | + $(INSTALL) -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \ | |
74 | fi | |
75 | ||
76 | install :: install-all-kernel-include | |
77 | diff -urN lm_sensors-2.5.2.orig/lib/Module.mk lm_sensors-2.5.2/lib/Module.mk | |
78 | --- lm_sensors-2.5.2.orig/lib/Module.mk Mon Jul 10 01:46:23 2000 | |
79 | +++ lm_sensors-2.5.2/lib/Module.mk Fri Sep 15 23:13:25 2000 | |
80 | @@ -87,12 +87,12 @@ | |
81 | ||
82 | install-lib: all-lib | |
83 | $(MKDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBINCLUDEDIR) $(DESTDIR)$(LIBMAN3DIR) $(DESTDIR)$(LIBMAN5DIR) | |
84 | - $(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR) | |
85 | + $(INSTALL) -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR) | |
86 | $(LN) $(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME) | |
87 | $(LN) $(LIBSHSONAME) $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME) | |
88 | - $(INSTALL) -o root -g root -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR) | |
89 | - $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR) | |
90 | - $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR) | |
91 | + $(INSTALL) -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR) | |
92 | + $(INSTALL) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR) | |
93 | + $(INSTALL) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR) | |
94 | ||
95 | install :: install-lib | |
96 | ||
97 | diff -urN lm_sensors-2.5.2.orig/prog/detect/Module.mk lm_sensors-2.5.2/prog/detect/Module.mk | |
98 | --- lm_sensors-2.5.2.orig/prog/detect/Module.mk Fri Dec 24 20:52:27 1999 | |
99 | +++ lm_sensors-2.5.2/prog/detect/Module.mk Fri Sep 15 23:13:42 2000 | |
100 | @@ -36,7 +36,7 @@ | |
101 | ||
102 | install-prog-detect: all-prog-detect | |
103 | mkdir -p $(DESTDIR)$(SBINDIR) | |
104 | - $(INSTALL) -o root -g root -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR) | |
105 | + $(INSTALL) -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR) | |
106 | install :: install-prog-detect | |
107 | ||
108 | clean-prog-detect: | |
109 | diff -urN lm_sensors-2.5.2.orig/prog/sensord/Module.mk lm_sensors-2.5.2/prog/sensord/Module.mk | |
110 | --- lm_sensors-2.5.2.orig/prog/sensord/Module.mk Mon Jul 3 00:49:34 2000 | |
111 | +++ lm_sensors-2.5.2/prog/sensord/Module.mk Fri Sep 15 23:14:07 2000 | |
112 | @@ -41,8 +41,8 @@ | |
113 | ||
114 | install-prog-sensord: all-prog-sensord | |
115 | $(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(PROGSENSORDMAN1DIR) | |
116 | - $(INSTALL) -o root -g root -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR) | |
117 | - $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR) | |
118 | + $(INSTALL) -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR) | |
119 | + $(INSTALL) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR) | |
120 | # install :: install-prog-sensord | |
121 | ||
122 | clean-prog-sensord: | |
123 | diff -urN lm_sensors-2.5.2.orig/prog/sensors/Module.mk lm_sensors-2.5.2/prog/sensors/Module.mk | |
124 | --- lm_sensors-2.5.2.orig/prog/sensors/Module.mk Fri Dec 24 20:52:28 1999 | |
125 | +++ lm_sensors-2.5.2/prog/sensors/Module.mk Fri Sep 15 23:14:17 2000 | |
126 | @@ -41,8 +41,8 @@ | |
127 | ||
128 | install-prog-sensors: all-prog-sensors | |
129 | mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(PROGSENSORSMAN1DIR) | |
130 | - $(INSTALL) -o root -g root -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR) | |
131 | - $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR) | |
132 | + $(INSTALL) -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR) | |
133 | + $(INSTALL) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR) | |
134 | install :: install-prog-sensors | |
135 | ||
136 | clean-prog-sensors: |