diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | etc/Module.mk | 2 |
3 files changed, 8 insertions, 7 deletions
@@ -7,6 +7,7 @@ SVN-HEAD Fix error propagation during expression evaluation Detect excessive recursion depth during expression evaluation lm_sensors.init.suse: Delete (actual SuSE script is much different) + Makefile: Install sensors.conf.default instead of sensors.conf.eg maxilife scripts: Delete (driver never ported to Linux 2.6) sensord: Accept negative temperatures in RRD database Don't bail out on transient errors (#2330) @@ -47,7 +47,7 @@ PREFIX := /usr/local # Your C compiler CC := gcc -# This is the directory where sensors.conf will be installed, if no other +# This is the directory where sensors3.conf will be installed, if no other # configuration file is found ETCDIR := /etc @@ -181,13 +181,13 @@ MANPAGES := $(LIBMAN3FILES) $(LIBMAN5FILES) $(PROGDETECTMAN8FILES) $(PROGDUMPMAN user :: user_install:: @echo "*** Important notes:" - @echo "*** * The libsensors configuration file ($(ETCDIR)/sensors.conf) is never" + @echo "*** * The libsensors configuration file ($(ETCDIR)/sensors3.conf) is never" @echo "*** overwritten by our installation process, so that you won't lose" @echo "*** your personal settings in that file. You still can get our latest" - @echo "*** default config file in etc/sensors.conf.eg and manually copy it to" - @echo "*** $(ETCDIR)/sensors.conf if you want. You will then want to edit it" - @echo "*** to fit your needs again." - @echo "*** * The format of $(ETCDIR)/sensors.conf changed with lm-sensors 3.0.0." + @echo "*** default config file in etc/sensors.conf.default and manually copy" + @echo "*** it to $(ETCDIR)/sensors3.conf if you want. You will then want to" + @echo "*** edit it to fit your needs again." + @echo "*** * The format of $(ETCDIR)/sensors3.conf changed with lm-sensors 3.0.0." @echo "*** If you have a custom configuration file using the old format, you" @echo "*** can convert it using the sensors-conf-convert script. Otherwise just" @echo "*** overwrite your old configuration file with the new default one." diff --git a/etc/Module.mk b/etc/Module.mk index 6b4a6102..78cb0b0b 100644 --- a/etc/Module.mk +++ b/etc/Module.mk @@ -22,7 +22,7 @@ MODULE_DIR := etc ETC_DIR := $(MODULE_DIR) -ETCTARGET := $(MODULE_DIR)/sensors.conf.eg +ETCTARGET := $(MODULE_DIR)/sensors.conf.default ETCINSTALL := $(ETCDIR)/sensors3.conf |