From 73f6c4cab3d2bd514ab25a9fa998690cfdb26e29 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 11:34:48 +0000
Subject: fix rebuilding of asterisk

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2229 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/asterisk/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'package/asterisk/Makefile')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 8be4c1193..35b52ec7d 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -10,6 +10,7 @@ PKG_MD5SUM:=0d7f1c680ae53a739f26a069ef8b580a
 PKG_SOURCE_URL:=http://ftp.digium.com/pub/asterisk/ ftp://ftp.digium.com/pub/asterisk/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/install
 PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
@@ -62,12 +63,13 @@ $(PKG_BUILD_DIR)/.built:
 		EXTRA_APPS="$(APPS)" \
 		EXTRA_MODS="$(MODS)" \
 		MODSPEEX="$(SPEEX)"
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install samples
 	touch $@
 
 $(IPKG_ASTERISK):
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(IDIR_ASTERISK)" \
-		install samples
+	cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_ASTERISK)
 	rm -rf $(IDIR_ASTERISK)/usr/sbin/astgenkey
 	rm -rf $(IDIR_ASTERISK)/usr/bin
 	rm -rf $(IDIR_ASTERISK)/usr/share
-- 
cgit v1.2.3