[Astlinux-commits] SF.net SVN: astlinux:[5604] branches/1.0/package

[<abe...@us...>]

Revision: 5604
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5604&view=rev
Author:   abelbeck
Date:     2012-07-11 03:57:57 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
fonulator, add missed tweaks from Michael

Modified Paths:
--------------
    branches/1.0/package/fbflash/fbflash.mk
    branches/1.0/package/fonulator/fonulator.mk

Modified: branches/1.0/package/fbflash/fbflash.mk
===================================================================
--- branches/1.0/package/fbflash/fbflash.mk	2012-07-10 22:35:37 UTC (rev 5603)
+++ branches/1.0/package/fbflash/fbflash.mk	2012-07-11 03:57:57 UTC (rev 5604)
@@ -6,8 +6,6 @@
 FBFLASH_VERSION:=2.0.0
 FBFLASH_SITE:=http://support.red-fone.com/fb_flash/
 FBFLASH_SOURCE:=fb_flash-$(FBFLASH_VERSION).tar.gz
-FBFLASH_INSTALL_STAGING = YES
-FBFLASH_INSTALL_TARGET = YES
 FBFLASH_CONF_OPT = \
 	--with-shared-libfb \
 	--without-readline
@@ -15,9 +13,9 @@
 FBFLASH_DEPENDENCIES = libfb
 
 define FBFLASH_INSTALL_TARGET_CMDS
-	cp -a $(STAGING_DIR)/usr/bin/fb_flash_util $(TARGET_DIR)/usr/sbin/
-	cp -a $(STAGING_DIR)/usr/bin/fb_reflector $(TARGET_DIR)/usr/sbin/
-	cp -a $(STAGING_DIR)/usr/bin/fb_udp $(TARGET_DIR)/usr/sbin/
+	cp -a $(@D)/fb_flash_util $(TARGET_DIR)/usr/sbin/
+	cp -a $(@D)/fb_reflector $(TARGET_DIR)/usr/sbin/
+	cp -a $(@D)/fb_udp $(TARGET_DIR)/usr/sbin/
 endef
 
 define FBFLASH_UNINSTALL_TARGET_CMDS

Modified: branches/1.0/package/fonulator/fonulator.mk
===================================================================
--- branches/1.0/package/fonulator/fonulator.mk	2012-07-10 22:35:37 UTC (rev 5603)
+++ branches/1.0/package/fonulator/fonulator.mk	2012-07-11 03:57:57 UTC (rev 5604)
@@ -6,8 +6,6 @@
 FONULATOR_VERSION:=2.0.3
 FONULATOR_SITE:=http://support.red-fone.com/downloads/fonulator
 FONULATOR_SOURCE:=fonulator-$(FONULATOR_VERSION).tar.gz
-FONULATOR_INSTALL_STAGING = YES
-FONULATOR_INSTALL_TARGET = YES
 
 FONULATOR_DEPENDENCIES = libargtable2 libfb
 
@@ -19,7 +17,8 @@
 	--with-shared-libfb
 
 define FONULATOR_INSTALL_TARGET_CMDS
-	cp -a $(STAGING_DIR)/usr/bin/fonulator $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -D $(@D)/fonulator $(TARGET_DIR)/usr/sbin/
+	$(INSTALL) -D $(@D)/redfone_sample.conf $(TARGET_DIR)/stat/etc/redfone.conf.sample
 	$(INSTALL) -D -m 0755 package/fonulator/fonulator.init $(TARGET_DIR)/etc/init.d/fonulator
 #	$(INSTALL) -D -m 0755 package/fonulator/setup-redfone.sh $(TARGET_DIR)/usr/sbin/setup-redfone
 	ln -sf /tmp/etc/redfone.conf $(TARGET_DIR)/etc/redfone.conf
@@ -29,7 +28,8 @@
 endef
 
 define FONULATOR_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/bin/fonulator
+	rm -f $(TARGET_DIR)/usr/sbin/fonulator
+	rm -f $(TARGET_DIR)/stat/etc/redfone.conf.sample
 	rm -f $(TARGET_DIR)/etc/init.d/fonulator
 #	rm -f $(TARGET_DIR)/usr/sbin/setup-redfone
 	rm -f $(TARGET_DIR)/etc/redfone.conf

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