Changeset 5676

Timestamp:

03/05/09 16:20:41 (4 years ago)

Author:

khali

Message:

Don't use variables when they hurt readability more than they help.

Files:

• lm-sensors/trunk/etc/Module.mk (modified) (2 diffs)

lm-sensors/trunk/etc/Module.mk

@@ -17 +17 @@
 #  MA 02110-1301 USA.
 
-# Note that MODULE_DIR (the directory in which this file resides) is a
-# '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.default
-ETCINSTALL := $(ETCDIR)/sensors3.conf
-ETCINSTALL_DIR_D := $(ETCDIR)/sensors.d
-
-
-# No all rule
+# Note: Don't confuse ETC_DIR (the directory in which this file resides)
+# with ETCDIR (the system directory in which configuration files will be
+# installed; typically /etc).
+ETC_DIR := etc
 
 install-etc:
-        $(MKDIR) $(DESTDIR)$(ETCDIR)
-        $(MKDIR) $(DESTDIR)$(ETCINSTALL_DIR_D)
-        if [ ! -e $(DESTDIR)$(ETCINSTALL) ] ; then \
-          $(INSTALL) -m 644 $(ETCTARGET) $(DESTDIR)$(ETCINSTALL); \
+        $(MKDIR) $(DESTDIR)$(ETCDIR) $(DESTDIR)$(ETCDIR)/sensors.d
+        if [ ! -e $(DESTDIR)$(ETCDIR)/sensors3.conf ] ; then \
+          $(INSTALL) -m 644 $(ETC_DIR)/sensors.conf.default $(DESTDIR)$(ETCDIR)/sensors3.conf ; \
         fi
         $(MKDIR) $(DESTDIR)$(BINDIR)
@@ -45 +36 @@
 
 user_uninstall :: uninstall-etc
-
-# No clean rule