---- ./etc/Module.mk.org Fri Dec 24 20:52:27 1999
-+++ ./etc/Module.mk Tue Jul 23 16:55:28 2002
+diff -Nur lm_sensors-2.8.0.orig/etc/Module.mk lm_sensors-2.8.0/etc/Module.mk
+--- lm_sensors-2.8.0.orig/etc/Module.mk 2003-06-28 22:04:51.000000000 +0200
++++ lm_sensors-2.8.0/etc/Module.mk 2003-07-25 23:13:42.000000000 +0200
@@ -29,7 +29,7 @@
install-etc:
$(MKDIR) $(DESTDIR)$(ETCDIR)
if [ ! -e $(DESTDIR)$(ETCINSTALL) ] ; then \
- $(INSTALL) -o root -g root -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \
-+ $(INSTALL) -o root -g root -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL) || true; \
++ $(INSTALL) -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \
fi
- install :: install-etc
+ user_install :: install-etc
---- ./kernel/busses/Module.mk.org Sat Jul 6 02:49:13 2002
-+++ ./kernel/busses/Module.mk Tue Jul 23 16:22:15 2002
-@@ -89,13 +89,13 @@
+diff -Nur lm_sensors-2.8.0.orig/kernel/busses/Module.mk lm_sensors-2.8.0/kernel/busses/Module.mk
+--- lm_sensors-2.8.0.orig/kernel/busses/Module.mk 2003-06-14 21:25:19.000000000 +0200
++++ lm_sensors-2.8.0/kernel/busses/Module.mk 2003-07-25 23:14:06.000000000 +0200
+@@ -105,7 +105,7 @@
+ install-kernel-busses: all-kernel-busses
if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \
- if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \
- $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
-- $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
-+ $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c || true; \
- for i in $(KERNELBUSSESTARGETS) ; do \
- $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \
- done \
- else \
- $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \
-- $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/misc ; \
-+ $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/misc || true; \
- fi \
- fi
-
---- ./kernel/chips/Module.mk.org Sat Jul 6 02:49:13 2002
-+++ ./kernel/chips/Module.mk Tue Jul 23 16:22:58 2002
-@@ -136,13 +136,13 @@
+ $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
+- $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
++ $(INSTALL) -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/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 ; \
+diff -Nur lm_sensors-2.8.0.orig/kernel/chips/Module.mk lm_sensors-2.8.0/kernel/chips/Module.mk
+--- lm_sensors-2.8.0.orig/kernel/chips/Module.mk 2003-07-03 19:27:09.000000000 +0200
++++ lm_sensors-2.8.0/kernel/chips/Module.mk 2003-07-25 23:14:11.000000000 +0200
+@@ -149,7 +149,7 @@
+ install-kernel-chips: all-kernel-chips
if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
- if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \
- $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \
-- $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \
-+ $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors || true; \
- for i in $(KERNELCHIPSTARGETS) ; do \
- $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \
- done \
- else \
- $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \
-- $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/misc ; \
-+ $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/misc || true; \
- fi \
- fi
-
---- ./kernel/include/Module.mk.org Tue Feb 6 03:53:46 2001
-+++ ./kernel/include/Module.mk Tue Jul 23 16:24:16 2002
-@@ -33,7 +33,7 @@
+ $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
+- $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
++ $(INSTALL) -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/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 ; \
+diff -Nur lm_sensors-2.8.0.orig/kernel/include/Module.mk lm_sensors-2.8.0/kernel/include/Module.mk
+--- lm_sensors-2.8.0.orig/kernel/include/Module.mk 2003-06-28 23:56:08.000000000 +0200
++++ lm_sensors-2.8.0/kernel/include/Module.mk 2003-07-25 23:14:18.000000000 +0200
+@@ -38,7 +38,7 @@
install-all-kernel-include:
if [ -n "$(KERNELINCLUDEFILES)" ] ; then \
$(MKDIR) $(DESTDIR)$(SYSINCLUDEDIR) ; \
- $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \
-+ $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) || true; \
++ $(INSTALL) -m 644 $(KERNELINCLUDEFILES) $(DESTDIR)$(SYSINCLUDEDIR) ; \
fi
- install :: install-all-kernel-include
---- ./kernel/Module.mk.org Tue Feb 6 03:53:46 2001
-+++ ./kernel/Module.mk Tue Jul 23 16:21:08 2002
+ user_install :: install-all-kernel-include
+diff -Nur lm_sensors-2.8.0.orig/kernel/Module.mk lm_sensors-2.8.0/kernel/Module.mk
+--- lm_sensors-2.8.0.orig/kernel/Module.mk 2003-05-31 17:48:28.000000000 +0200
++++ lm_sensors-2.8.0/kernel/Module.mk 2003-07-25 23:13:59.000000000 +0200
@@ -39,7 +39,7 @@
install-kernel: all-kernel
- if [ -n "$(KERNELTARGETS)" ] ; then \
- $(MKDIR) $(DESTDIR)$(MODDIR) ; \
-- $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
-+ $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) || true ;\
- fi
- $(RM) $(DESTDIR)$(MODDIR)/sensors.o
-
---- ./lib/Module.mk.org Sat Mar 23 01:53:08 2002
-+++ ./lib/Module.mk Tue Jul 23 16:46:24 2002
-@@ -87,12 +87,12 @@
+ # if [ -n "$(KERNELTARGETS)" ] ; then \
+ # $(MKDIR) $(DESTDIR)$(MODDIR) ; \
+-# $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
++# $(INSTALL) -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\
+ # fi
+ $(RM) $(DESTDIR)$(MODPREF)/misc/sensors.o
- install-lib: all-lib
- $(MKDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBINCLUDEDIR) $(DESTDIR)$(LIBMAN3DIR) $(DESTDIR)$(LIBMAN5DIR)
+diff -Nur lm_sensors-2.8.0.orig/lib/Module.mk lm_sensors-2.8.0/lib/Module.mk
+--- lm_sensors-2.8.0.orig/lib/Module.mk 2003-07-08 14:47:41.000000000 +0200
++++ lm_sensors-2.8.0/lib/Module.mk 2003-07-25 23:16:02.000000000 +0200
+@@ -106,7 +106,7 @@
+ echo ' Run the following command: /sbin/ldconfig' ; \
+ echo '******************************************************************************' ; \
+ fi
- $(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
-+ $(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR) || true
++ $(INSTALL) -m 644 $(LIBTARGETS) $(DESTDIR)$(LIBDIR)
$(LN) $(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME)
$(LN) $(LIBSHSONAME) $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME)
+ @if [ "$(DESTDIR)$(LIBDIR)" != "/usr/lib" -a "$(DESTDIR)$(LIBDIR)" != "/lib" ] ; then \
+@@ -128,9 +128,9 @@
+ echo ' Add it and run /sbin/ldconfig for the userspace tools to work.' ; \
+ echo '******************************************************************************' ) ; \
+ fi
- $(INSTALL) -o root -g root -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR)
- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR)
- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR)
-+ $(INSTALL) -o root -g root -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR) ||true
-+ $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR) || true
-+ $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR) || true
++ $(INSTALL) -m 644 $(LIBHEADERFILES) $(DESTDIR)$(LIBINCLUDEDIR)
++ $(INSTALL) -m 644 $(LIBMAN3FILES) $(DESTDIR)$(LIBMAN3DIR)
++ $(INSTALL) -m 644 $(LIBMAN5FILES) $(DESTDIR)$(LIBMAN5DIR)
- install :: install-lib
---- ./prog/detect/Module.mk.org Fri Dec 24 20:52:27 1999
-+++ ./prog/detect/Module.mk Tue Jul 23 16:49:07 2002
-@@ -36,7 +36,7 @@
+ user_install :: install-lib
+diff -Nur lm_sensors-2.8.0.orig/Makefile lm_sensors-2.8.0/Makefile
+--- lm_sensors-2.8.0.orig/Makefile 2003-07-08 11:06:50.000000000 +0200
++++ lm_sensors-2.8.0/Makefile 2003-07-25 23:13:29.000000000 +0200
+@@ -186,7 +186,8 @@
+ # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
+ # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
+ ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS)
+-ALL_CFLAGS := -Wall -O2
++OPTS = -O2
++ALL_CFLAGS := -Wall $(OPTS)
+
+ ifeq ($(DEBUG),1)
+ ALL_CPPFLAGS += -DDEBUG
+diff -Nur lm_sensors-2.8.0.orig/prog/detect/Module.mk lm_sensors-2.8.0/prog/detect/Module.mk
+--- lm_sensors-2.8.0.orig/prog/detect/Module.mk 2003-07-07 12:44:29.000000000 +0200
++++ lm_sensors-2.8.0/prog/detect/Module.mk 2003-07-25 23:16:42.000000000 +0200
+@@ -37,9 +37,9 @@
install-prog-detect: all-prog-detect
mkdir -p $(DESTDIR)$(SBINDIR)
- $(INSTALL) -o root -g root -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR)
-+ $(INSTALL) -o root -g root -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR) || true
- install :: install-prog-detect
++ $(INSTALL) -m 755 $(PROGDETECTSBININSTALL) $(DESTDIR)$(SBINDIR)
+ if [ ! -e $(DESTDIR)$(SBINDIR)/dmidecode -o $(DESTDIR)$(SBINDIR)/dmidecode -ot $(PROGDETECTDIR)/dmidecode.c ] ; then \
+- $(INSTALL) -o root -g root -m 755 $(PROGDETECTDIR)/dmidecode $(DESTDIR)$(SBINDIR) ; \
++ $(INSTALL) -m 755 $(PROGDETECTDIR)/dmidecode $(DESTDIR)$(SBINDIR) ; \
+ fi
+ user_install :: install-prog-detect
- clean-prog-detect:
---- ./prog/sensord/Module.mk.org Sun Apr 28 16:26:07 2002
-+++ ./prog/sensord/Module.mk Tue Jul 23 16:49:49 2002
+diff -Nur lm_sensors-2.8.0.orig/prog/dump/Module.mk lm_sensors-2.8.0/prog/dump/Module.mk
+--- lm_sensors-2.8.0.orig/prog/dump/Module.mk 2003-06-28 22:04:50.000000000 +0200
++++ lm_sensors-2.8.0/prog/dump/Module.mk 2003-07-25 23:16:50.000000000 +0200
+@@ -39,7 +39,7 @@
+
+ install-prog-dump: all-prog-dump
+ mkdir -p $(DESTDIR)$(SBINDIR)
+- $(INSTALL) -o root -g root -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR)
++ $(INSTALL) -m 755 $(PROGDUMPBININSTALL) $(DESTDIR)$(SBINDIR)
+ user_install :: install-prog-dump
+
+ clean-prog-dump:
+diff -Nur lm_sensors-2.8.0.orig/prog/hotplug/Makefile lm_sensors-2.8.0/prog/hotplug/Makefile
+--- lm_sensors-2.8.0.orig/prog/hotplug/Makefile 2003-05-31 19:30:47.000000000 +0200
++++ lm_sensors-2.8.0/prog/hotplug/Makefile 2003-07-25 23:17:07.000000000 +0200
+@@ -18,7 +18,7 @@
+ $(CC) $(CFLAGS) -c $< -o $@
+
+ install: all
+- install -o root -g root -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses
++ install -m 644 $(OBJS) /lib/modules/$(VER)/kernel/drivers/i2c/busses
+
+ clean:
+ rm -f $(OBJS)
+diff -Nur lm_sensors-2.8.0.orig/prog/rrd/Makefile lm_sensors-2.8.0/prog/rrd/Makefile
+--- lm_sensors-2.8.0.orig/prog/rrd/Makefile 2002-01-05 16:39:17.000000000 +0100
++++ lm_sensors-2.8.0/prog/rrd/Makefile 2003-07-25 23:17:50.000000000 +0200
+@@ -22,7 +22,7 @@
+ sed -e "s#%%RRDPATH%%#$(RRDPATH)#g;s#%%APACHDIR%%#$(APACHDIR)#g;s#%%RRDDIR%%#$(RRDDIR)#g;s#%%MACH%%#$(MACH)#g" $< > $@
+
+ $(RRDDIR) :
+- install -d -o $(USER) $(RRDDIR)
++ install -d $(RRDDIR)
+
+ $(RRDB) : $(RRDDIR)
+ ./sens_create_rrd $(RRDB)
+@@ -38,13 +38,13 @@
+ $(error error - Web server directory $(APACHE) not present - check APACHE definition in Makefile)
+
+ $(APACHDIR)/pix : $(APACHE)
+- install -d -o $(USER) -m 777 $(APACHDIR)/pix
++ install -d -m 777 $(APACHDIR)/pix
+
+ install: all $(RRDB) $(SENSDIR) $(CRONTAB) $(APACHDIR)/pix
+- install -o root -g root -m 755 sens_update_rrd $(BINPATH)
+- install -o root -g root -m 755 sens_week.cgi $(APACHDIR)
+- install -o root -g root -m 755 sens_day.cgi $(APACHDIR)
+- install -o root -g root -m 755 summ_week.cgi $(APACHDIR)
++ install -m 755 sens_update_rrd $(BINPATH)
++ install -m 755 sens_week.cgi $(APACHDIR)
++ install -m 755 sens_day.cgi $(APACHDIR)
++ install -m 755 summ_week.cgi $(APACHDIR)
+ # grep sens_update_rrd $(CRONTAB) > /dev/null 2>&1 || echo '*/5 * * * * /usr/local/bin/sens_update_rrd' $(RRDB) $(SENSDEV) >> $(CRONTAB)
+ @echo
+ @echo Note!!! You must manually install the following line in the crontab for user $(USER):
+diff -Nur lm_sensors-2.8.0.orig/prog/sensord/Module.mk lm_sensors-2.8.0/prog/sensord/Module.mk
+--- lm_sensors-2.8.0.orig/prog/sensord/Module.mk 2003-06-28 22:04:50.000000000 +0200
++++ lm_sensors-2.8.0/prog/sensord/Module.mk 2003-07-25 23:18:02.000000000 +0200
@@ -45,8 +45,8 @@
install-prog-sensord: all-prog-sensord
$(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(PROGSENSORDMAN1DIR)
- $(INSTALL) -o root -g root -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR)
- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR)
-+ $(INSTALL) -o root -g root -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR) || true
-+ $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR) || true
- install :: install-prog-sensord
++ $(INSTALL) -m 755 $(PROGSENSORDTARGETS) $(DESTDIR)$(SBINDIR)
++ $(INSTALL) -m 644 $(PROGSENSORDMAN1FILES) $(DESTDIR)$(PROGSENSORDMAN1DIR)
+ user_install :: install-prog-sensord
clean-prog-sensord:
---- ./prog/sensors/Module.mk.org Fri Dec 24 20:52:28 1999
-+++ ./prog/sensors/Module.mk Tue Jul 23 16:50:43 2002
+diff -Nur lm_sensors-2.8.0.orig/prog/sensors/Module.mk lm_sensors-2.8.0/prog/sensors/Module.mk
+--- lm_sensors-2.8.0.orig/prog/sensors/Module.mk 2003-06-28 22:04:50.000000000 +0200
++++ lm_sensors-2.8.0/prog/sensors/Module.mk 2003-07-25 23:18:14.000000000 +0200
@@ -41,8 +41,8 @@
install-prog-sensors: all-prog-sensors
mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(PROGSENSORSMAN1DIR)
- $(INSTALL) -o root -g root -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR)
- $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
-+ $(INSTALL) -o root -g root -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR) || true
-+ $(INSTALL) -o $(MANOWN) -g $(MANGRP) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR) || true
- install :: install-prog-sensors
++ $(INSTALL) -m 755 $(PROGSENSORSTARGETS) $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 644 $(PROGSENSORSMAN1FILES) $(DESTDIR)$(PROGSENSORSMAN1DIR)
+ user_install :: install-prog-sensors
clean-prog-sensors:
---- ./Makefile.org Mon Apr 29 03:37:07 2002
-+++ ./Makefile Tue Jul 23 16:19:17 2002
-@@ -170,8 +170,9 @@
- # PROGCPPFLAGS/PROGCFLAGS is to create non-kernel object files (which are linked into executables).
- # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
- # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
-+OPTS=-O2
- ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS)
--ALL_CFLAGS := -O2
-+ALL_CFLAGS := $(OPTS)
-
- ifeq ($(DEBUG),1)
- ALL_CPPFLAGS += -DDEBUG
projects / packages / lm_sensors.git / blobdiff