[Astlinux-commits] SF.net SVN: astlinux: [849] branches/0.4/package/apcupsd/apcupsd.mk

[<dha...@us...>]

Revision: 849
          http://svn.sourceforge.net/astlinux/?rev=849&view=rev
Author:   dhartman
Date:     2007-04-18 11:25:59 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
changes to apcupsd from trunk

Modified Paths:
--------------
    branches/0.4/package/apcupsd/apcupsd.mk

Modified: branches/0.4/package/apcupsd/apcupsd.mk
===================================================================
--- branches/0.4/package/apcupsd/apcupsd.mk	2007-04-18 18:25:37 UTC (rev 848)
+++ branches/0.4/package/apcupsd/apcupsd.mk	2007-04-18 18:25:59 UTC (rev 849)
@@ -4,10 +4,10 @@
 #
 #############################################################
 APCUPSD_SOURCE:=apcupsd-3.12.4.tar.gz
-APCUPSD_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/apcupsd/
+APCUPSD_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/apcupsd
 APCUPSD_DIR:=$(BUILD_DIR)/apcupsd-3.12.4
 APCUPSD_CAT:=zcat
-APCUPSD_BINARY:=apcupsd
+APCUPSD_BINARY:=src/apcupsd
 APCUPSD_TARGET_BINARY:=usr/sbin/apcupsd
 
 $(DL_DIR)/$(APCUPSD_SOURCE):
@@ -15,7 +15,7 @@
 
 apcupsd-source: $(DL_DIR)/$(APCUPSD_SOURCE)
 
-$(APCUPSD_DIR)/.source: $(DL_DIR)/$(APCUPSD_SOURCE) $(DL_DIR)/$(APCUPSD_PATCH)
+$(APCUPSD_DIR)/.source: $(DL_DIR)/$(APCUPSD_SOURCE)
 	zcat $(DL_DIR)/$(APCUPSD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	touch $(APCUPSD_DIR)/.source
 
@@ -34,10 +34,11 @@
 	--sysconfdir=/etc/apcupsd \
 	--enable-usb \
 	);
-	touch $(APCUPSD_DIR)/.configured;
+	touch $(APCUPSD_DIR)/.configured
 
 $(APCUPSD_DIR)/$(APCUPSD_BINARY): $(APCUPSD_DIR)/.configured
 	$(MAKE1) CC=$(TARGET_CC) -C $(APCUPSD_DIR)
+	touch -c $(APCUPSD_DIR)/$(APCUPSD_BINARY)
 
 $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY): $(APCUPSD_DIR)/$(APCUPSD_BINARY)
 	mkdir -p $(STAGING_DIR)/etc/rc.d/init.d
@@ -45,13 +46,14 @@
 	$(INSTALL) -D -m 0755 package/apcupsd/apcupsd.init $(TARGET_DIR)/etc/init.d/apcupsd
 	mkdir -p $(TARGET_DIR)/stat/etc/apcupsd
 	-rm $(STAGING_DIR)/etc/apcupsd/*.orig $(STAGING_DIR)/etc/apcupsd/*.new
-	cp -a $(STAGING_DIR)/etc/apcupsd/* $(TARGET_DIR)/stat/etc/apcupsd/
+	#cp -a $(STAGING_DIR)/etc/apcupsd/* $(TARGET_DIR)/stat/etc/apcupsd/
 	$(INSTALL) -D -m 0755 package/apcupsd/apccontrol $(TARGET_DIR)/stat/etc/apcupsd/apccontrol
 	ln -sf /tmp/etc/apcupsd $(TARGET_DIR)/etc/apcupsd
 	$(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/apcaccess $(TARGET_DIR)/usr/sbin/apcaccess
 	$(INSTALL) -D -m 0755 $(STAGING_DIR)/$(APCUPSD_TARGET_BINARY) $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
 	$(STRIP) $(TARGET_DIR)/usr/sbin/apcaccess
 	$(STRIP) $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
+	touch -c $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
 
 apcupsd: uclibc libusb $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.