mirror of
https://github.com/lm-sensors/lm-sensors
synced 2025-08-31 14:25:39 +00:00
Install sensors.conf.default instead of sensors.conf.eg.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5605 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1
CHANGES
1
CHANGES
@@ -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)
|
||||
|
12
Makefile
12
Makefile
@@ -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."
|
||||
|
@@ -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
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user