[Astlinux-commits] SF.net SVN: astlinux: [277] trunk/package/zaptel/zaptel.mk

[<kr...@us...>]

Revision: 277
Author:   krisk84
Date:     2006-08-17 20:31:12 -0700 (Thu, 17 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=277&view=rev

Log Message:
-----------
rhino fixes

Modified Paths:
--------------
    trunk/package/zaptel/zaptel.mk
Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2006-08-17 18:27:40 UTC (rev 276)
+++ trunk/package/zaptel/zaptel.mk	2006-08-18 03:31:12 UTC (rev 277)
@@ -9,10 +9,10 @@
 ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION)
 ZAPTEL_BINARY := ztcfg
 ZAPTEL_TARGET_BINARY := sbin/ztcfg
-RHINO_SITE := ftp://ftp.rhinoequipment.com/.dist/
+RHINO_SITE := ftp://ftp.rhinoequipment.com/.dist
 RHINO_VER=1.0
 RHINO_PKG := rhino-$(RHINO_VER)_$(ZAPTEL_VERSION).tar.gz
-RHINO_DIR=$(BUILD_DIR)/rhino_$(RHINO_VER)_$(ZAPTEL_VERSION)
+RHINO_DIR=$(BUILD_DIR)/rhino-$(RHINO_VER)_$(ZAPTEL_VERSION)
 
 #LINUX_VER=$(subst ",, $(strip $(BR2_PACKAGE_LINUX_VERSION)))
 #"
@@ -47,9 +47,10 @@
 	toolchain/patch-kernel.sh $(ZAPTEL_DIR) package/zaptel/ zaptel\*.patch
 	# Rhino-enabled
 ifeq ($(BR2_PACKAGE_ZAPTEL_RHINO),y)
-	zcat $(DL_DIR)/$(RHINO_PKG) | tar -C $(ZAPTEL_DIR) $(TAR_OPTIONS) -
+	zcat $(DL_DIR)/$(RHINO_PKG) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	# Hopefully the astlinux mainline zaptel patches won't disrupt the Rhino's
 	toolchain/patch-kernel.sh $(ZAPTEL_DIR) $(RHINO_DIR)/ rhino-\*.patch
+	cp $(RHINO_DIR)/* $(ZAPTEL_DIR)/
 endif
 	# end Rhino
 	touch $(ZAPTEL_DIR)/.source


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