From c9ef1503a5dfc80f3ba1186eecc18245fa139afb Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 22 Nov 2007 20:03:29 +0000 Subject: [PATCH] Fix MODULE_DIR usage. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5034 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + etc/Module.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 7fd805d7..05541a46 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ lm-sensors CHANGES file ----------------------- SVN HEAD + Makefile: Fix MODULE_DIR usage in etc pwmconfig: Better diagnostics in pwmdisable Give the fans some time to spin up sensors-detect: Add Texas Instruments TMP401 detection diff --git a/etc/Module.mk b/etc/Module.mk index f9640236..2eb3fafb 100644 --- a/etc/Module.mk +++ b/etc/Module.mk @@ -19,6 +19,7 @@ # 'simply expanded variable'. That means that its value is substituted # verbatim in the rules, until it is redefined. MODULE_DIR := etc +ETC_DIR := $(MODULE_DIR) ETCTARGET := $(MODULE_DIR)/sensors.conf.eg ETCINSTALL := $(ETCDIR)/sensors3.conf @@ -32,7 +33,7 @@ install-etc: $(INSTALL) -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \ fi $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 755 $(MODULE_DIR)/sensors-conf-convert $(DESTDIR)$(BINDIR) + $(INSTALL) -m 755 $(ETC_DIR)/sensors-conf-convert $(DESTDIR)$(BINDIR) user_install :: install-etc