From b861a915ba1850e20861a856ffece4557b88018b Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 14 Sep 2007 18:48:44 +0000 Subject: [PATCH] - touchup a few bits that the submitter should have done in the first place --- package/lm-sensors/lm-sensors.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 6cbd27b815..532061b581 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -29,6 +29,7 @@ ifneq ($(LM_SENSORS_PATCH),) toolchain/patch-kernel.sh $(LM_SENSORS_DIR) $(LM_SENSORS_DIR)/debian/patches \*.patch; \ fi endif + -$(SED) "s/-O[[:digit:]]//g" $(LM_SENSORS_DIR)/Makefile touch $@ $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY): $(LM_SENSORS_DIR)/.unpacked @@ -38,6 +39,12 @@ $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY): $(LM_SENSORS_DIR)/.unpacked DESTDIR=$(TARGET_DIR) user $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY): $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) + if [ ! -f $(TARGET_DIR)/etc/sensors.conf ]; then \ + cp -dpf $(LM_SENSORS_DIR)/etc/sensors.conf.eg \ + $(TARGET_DIR)/etc/sensors.conf; \ + $(SED) '/^#/d' -e '/^[[:space:]]*$$/d' \ + $(TARGET_DIR)/etc/sensors.conf; \ + fi cp -dpf $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) $@ cp -dpf $(LM_SENSORS_DIR)/lib/libsensors.so* \ $(LM_SENSORS_DIR)/lib/libsensors.a $(TARGET_DIR)/usr/lib/ @@ -48,7 +55,9 @@ lm-sensors: uclibc libsysfs $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) lm-sensors-clean: -$(MAKE) -C $(LM_SENSORS_DIR) clean - rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) + rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) \ + $(TARGET_DIR)/lib/libsensors* \ + $(TARGET_DIR)/etc/sensors.conf lm-sensors-dirclean: rm -rf $(LM_SENSORS_DIR) -- 2.30.2