]>
Commit | Line | Data |
---|---|---|
1 | diff -urN lm_sensors-2.6.5.orig/Makefile lm_sensors-2.6.5/Makefile | |
2 | --- lm_sensors-2.6.5.orig/Makefile Sun Sep 22 13:29:54 2002 | |
3 | +++ lm_sensors-2.6.5/Makefile Sun Sep 22 13:30:32 2002 | |
4 | @@ -170,8 +170,9 @@ | |
5 | # PROGCPPFLAGS/PROGCFLAGS is to create non-kernel object files (which are linked into executables). | |
6 | # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries). | |
7 | # LIBCPPFLAGS/LIBCFLAGS are for shared library objects. | |
8 | +OPTS=-O2 | |
9 | ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS) | |
10 | -ALL_CFLAGS := -O2 | |
11 | +ALL_CFLAGS := $(OPTS) | |
12 | ||
13 | ifeq ($(DEBUG),1) | |
14 | ALL_CPPFLAGS += -DDEBUG | |
15 | diff -urN lm_sensors-2.6.5.orig/etc/Module.mk lm_sensors-2.6.5/etc/Module.mk | |
16 | --- lm_sensors-2.6.5.orig/etc/Module.mk Sun Sep 22 13:29:54 2002 | |
17 | +++ lm_sensors-2.6.5/etc/Module.mk Sun Sep 22 13:30:32 2002 | |
18 | @@ -29,7 +29,7 @@ | |
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 | + $(INSTALL) -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \ | |
24 | fi | |
25 | install :: install-etc | |
26 | ||
27 | diff -urN lm_sensors-2.6.5.orig/kernel/Module.mk lm_sensors-2.6.5/kernel/Module.mk | |
28 | --- lm_sensors-2.6.5.orig/kernel/Module.mk Sun Sep 22 13:29:54 2002 | |
29 | +++ lm_sensors-2.6.5/kernel/Module.mk Sun Sep 22 13:30:32 2002 | |
30 | @@ -39,7 +39,7 @@ | |
31 | install-kernel: all-kernel | |
32 | if [ -n "$(KERNELTARGETS)" ] ; then \ | |
33 | $(MKDIR) $(DESTDIR)$(MODDIR) ; \ | |
34 | - $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\ | |
35 | + $(INSTALL) -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\ | |
36 | fi | |
37 | $(RM) $(DESTDIR)$(MODDIR)/sensors.o | |
38 | ||
39 | diff -urN lm_sensors-2.6.5.orig/kernel/busses/Module.mk lm_sensors-2.6.5/kernel/busses/Module.mk | |
40 | --- lm_sensors-2.6.5.orig/kernel/busses/Module.mk Sun Sep 22 13:29:54 2002 | |
41 | +++ lm_sensors-2.6.5/kernel/busses/Module.mk Sun Sep 22 13:30:32 2002 | |
42 | @@ -90,13 +90,13 @@ | |
43 | if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \ | |
44 | if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \ | |
45 | $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \ | |
46 | - $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \ | |
47 | + $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \ | |
48 | for i in $(KERNELBUSSESTARGETS) ; do \ | |
49 | $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \ | |
50 | done \ | |
51 | else \ | |
52 | $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \ | |
53 | - $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/misc ; \ | |
54 | + $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/misc ; \ | |
55 | fi \ | |
56 | fi | |
57 | ||
58 | diff -urN lm_sensors-2.6.5.orig/kernel/chips/Module.mk lm_sensors-2.6.5/kernel/chips/Module.mk | |
59 | --- lm_sensors-2.6.5.orig/kernel/chips/Module.mk Sun Sep 22 13:29:54 2002 | |
60 | +++ lm_sensors-2.6.5/kernel/chips/Module.mk Sun Sep 22 13:30:32 2002 | |
61 | @@ -137,13 +137,13 @@ | |
62 | if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \ | |
63 | if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \ | |
64 | $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \ | |
65 | - $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \ | |
66 | + $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \ | |
67 | for i in $(KERNELCHIPSTARGETS) ; do \ | |
68 | $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \ | |
69 | done \ | |
70 | else \ | |
71 | $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \ | |
72 | - $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/misc ; \ | |
73 | + $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/misc ; \ | |
74 | fi \ | |
75 | fi | |
76 | ||
77 | diff -urN lm_sensors-2.6.5.orig/kernel/include/Module.mk lm_sensors-2.6.5/kernel/include/Module.mk | |
78 | --- lm_sensors-2.6.5.orig/kernel/include/Module.mk Sun Sep 22 13:29:54 2002 | |
79 | +++ lm_sensors-2.6.5/kernel/include/Module.mk Sun Sep 22 13:30:32 2002 | |
80 | @@ -33,7 +33,7 @@ | |
81 | install-all-kernel-include: | |
82 | if [ -n "$(KERNELINCLUDEFILES)" ] ; then \ | |
83 | $(MKDIR) $(DESTDIR)$(SYSINCLUDEDIR) ; \ | |
84 | - $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \ | |
85 | + $(INSTALL) -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \ | |
86 | fi | |
87 | ||
88 | install :: install-all-kernel-include | |
89 | diff -urN lm_sensors-2.6.5.orig/lib/Module.mk lm_sensors-2.6.5/lib/Module.mk | |
90 | --- lm_sensors-2.6.5.orig/lib/Module.mk Sun Sep 22 13:29:54 2002 | |
91 | +++ lm_sensors-2.6.5/lib/Module.mk Sun Sep 22 13:30:32 2002 | |
92 | @@ -87,12 +87,12 @@ | |
93 | ||
94 | install-lib: all-lib | |
95 | $(MKDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBINCLUDEDIR) $(DESTDIR)$(LIBMAN3DIR) $(DESTDIR)$(LIBMAN5DIR) | |
96 | - $(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR) | |
97 | + $(INSTALL) -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR) | |
98 | $(LN) $(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME) | |
99 | $(LN) $(LIBSHSONAME) $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME) | |
100 | - $(INSTALL) -o root -g root -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR) | |
101 | - $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR) | |
102 | - $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR) | |
103 | + $(INSTALL) -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR) | |
104 | + $(INSTALL) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR) | |
105 | + $(INSTALL) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR) | |
106 | ||
107 | install :: install-lib | |
108 | ||
109 | diff -urN lm_sensors-2.6.5.orig/prog/detect/Module.mk lm_sensors-2.6.5/prog/detect/Module.mk | |
110 | --- lm_sensors-2.6.5.orig/prog/detect/Module.mk Sun Sep 22 13:29:54 2002 | |
111 | +++ lm_sensors-2.6.5/prog/detect/Module.mk Sun Sep 22 13:30:32 2002 | |
112 | @@ -37,7 +37,7 @@ | |
113 | ||
114 | install-prog-detect: all-prog-detect | |
115 | mkdir -p $(DESTDIR)$(SBINDIR) | |
116 | - $(INSTALL) -o root -g root -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR) | |
117 | + $(INSTALL) -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR) | |
118 | install :: install-prog-detect | |
119 | ||
120 | clean-prog-detect: | |
121 | diff -urN lm_sensors-2.6.5.orig/prog/dump/Module.mk lm_sensors-2.6.5/prog/dump/Module.mk | |
122 | --- lm_sensors-2.6.5.orig/prog/dump/Module.mk Sun Sep 22 13:29:54 2002 | |
123 | +++ lm_sensors-2.6.5/prog/dump/Module.mk Sun Sep 22 13:49:15 2002 | |
124 | @@ -39,7 +39,7 @@ | |
125 | ||
126 | install-prog-dump: all-prog-dump | |
127 | mkdir -p $(DESTDIR)$(SBINDIR) | |
128 | - $(INSTALL) -o root -g root -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR) | |
129 | + $(INSTALL) -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR) | |
130 | install :: install-prog-dump | |
131 | ||
132 | clean-prog-dump: | |
133 | diff -urN lm_sensors-2.6.5.orig/prog/rrd/Makefile lm_sensors-2.6.5/prog/rrd/Makefile | |
134 | --- lm_sensors-2.6.5.orig/prog/rrd/Makefile Sun Sep 22 13:29:54 2002 | |
135 | +++ lm_sensors-2.6.5/prog/rrd/Makefile Sun Sep 22 13:31:17 2002 | |
136 | @@ -41,10 +41,10 @@ | |
137 | install -d -o $(USER) -m 777 $(APACHDIR)/pix | |
138 | ||
139 | install: all $(RRDB) $(SENSDIR) $(CRONTAB) $(APACHDIR)/pix | |
140 | - install -o root -g root -m 755 sens_update_rrd $(BINPATH) | |
141 | - install -o root -g root -m 755 sens_week.cgi $(APACHDIR) | |
142 | - install -o root -g root -m 755 sens_day.cgi $(APACHDIR) | |
143 | - install -o root -g root -m 755 summ_week.cgi $(APACHDIR) | |
144 | + install -m 755 sens_update_rrd $(BINPATH) | |
145 | + install -m 755 sens_week.cgi $(APACHDIR) | |
146 | + install -m 755 sens_day.cgi $(APACHDIR) | |
147 | + install -m 755 summ_week.cgi $(APACHDIR) | |
148 | # grep sens_update_rrd $(CRONTAB) > /dev/null 2>&1 || echo '*/5 * * * * /usr/local/bin/sens_update_rrd' $(RRDB) $(SENSDEV) >> $(CRONTAB) | |
149 | @echo | |
150 | @echo Note!!! You must manually install the following line in the crontab for user $(USER): | |
151 | diff -urN lm_sensors-2.6.5.orig/prog/sensord/Module.mk lm_sensors-2.6.5/prog/sensord/Module.mk | |
152 | --- lm_sensors-2.6.5.orig/prog/sensord/Module.mk Sun Sep 22 13:29:54 2002 | |
153 | +++ lm_sensors-2.6.5/prog/sensord/Module.mk Sun Sep 22 13:30:32 2002 | |
154 | @@ -45,8 +45,8 @@ | |
155 | ||
156 | install-prog-sensord: all-prog-sensord | |
157 | $(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(PROGSENSORDMAN1DIR) | |
158 | - $(INSTALL) -o root -g root -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR) | |
159 | - $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR) | |
160 | + $(INSTALL) -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR) | |
161 | + $(INSTALL) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR) | |
162 | install :: install-prog-sensord | |
163 | ||
164 | clean-prog-sensord: | |
165 | diff -urN lm_sensors-2.6.5.orig/prog/sensors/Module.mk lm_sensors-2.6.5/prog/sensors/Module.mk | |
166 | --- lm_sensors-2.6.5.orig/prog/sensors/Module.mk Sun Sep 22 13:29:54 2002 | |
167 | +++ lm_sensors-2.6.5/prog/sensors/Module.mk Sun Sep 22 13:30:32 2002 | |
168 | @@ -41,8 +41,8 @@ | |
169 | ||
170 | install-prog-sensors: all-prog-sensors | |
171 | mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(PROGSENSORSMAN1DIR) | |
172 | - $(INSTALL) -o root -g root -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR) | |
173 | - $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR) | |
174 | + $(INSTALL) -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR) | |
175 | + $(INSTALL) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR) | |
176 | install :: install-prog-sensors | |
177 | ||
178 | clean-prog-sensors: |