[Astlinux-commits] SF.net SVN: astlinux: [863] branches/s2s/package/asterisk/asterisk.mk

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

Revision: 863
          http://svn.sourceforge.net/astlinux/?rev=863&view=rev
Author:   krisk84
Date:     2007-04-18 12:08:01 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
merge changes from trunk

Modified Paths:
--------------
    branches/s2s/package/asterisk/asterisk.mk

Modified: branches/s2s/package/asterisk/asterisk.mk
===================================================================
--- branches/s2s/package/asterisk/asterisk.mk	2007-04-18 19:07:09 UTC (rev 862)
+++ branches/s2s/package/asterisk/asterisk.mk	2007-04-18 19:08:01 UTC (rev 863)
@@ -110,7 +110,12 @@
 	touch -c $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)
 	-rm $(TARGET_DIR)/etc/asterisk/*.old
 	-rm $(TARGET_DIR)/stat/var/lib/asterisk/mohmp3/*
+ifneq ($(wildcard package/asterisk/config/extensions.conf),)
+	mkdir -p $(TARGET_DIR)/stat/etc/asterisk
+	cp -a package/asterisk/config/* $(TARGET_DIR)/stat/etc/asterisk
+	else
 	mv $(TARGET_DIR)/etc/asterisk $(TARGET_DIR)/stat/etc/
+endif
 	$(INSTALL) -D -m 0755 package/asterisk/logger.conf $(TARGET_DIR)/stat/etc/asterisk/logger.conf
 ifeq ($(strip $(BR2_PACKAGE_ASTERISK_CHANBLUETOOTH)),y)
 	$(INSTALL) -D -m 0755 $(BUILD_DIR)/usr/src/asterisk-test/bluetooth/chan_bluetooth/conf/bluetooth.conf \


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