X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fasterisk-xip%2FMakefile;h=6509f7685db5fff0f13eabe6771a841e066e3694;hp=13ecbe0ec14c4a8e10e30df8a97c94e721eb2dd9;hb=dabf916db20da0013033efb763b632aecaea20a5;hpb=ba66d54b5f4064664c69f614d55814cc6e862997

diff --git a/contrib/package/asterisk-xip/Makefile b/contrib/package/asterisk-xip/Makefile
index 13ecbe0ec..6509f7685 100644
--- a/contrib/package/asterisk-xip/Makefile
+++ b/contrib/package/asterisk-xip/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk
 PKG_VERSION:=1.4.22
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/
@@ -35,8 +35,9 @@ STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar, \
 
 define Package/asterisk14-xip/Default
   SUBMENU:=asterisk14-xip (Complete Open Source PBX), v1.4.x
-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=Asterisk
   URL:=http://www.asterisk.org/
 endef
 
@@ -822,6 +823,7 @@ Channel functions
   func_channel
   app_softhangup
   app_directed_pickup Pickup a (specific) ringing extensions
+  app_pickup2  Extended pickup
 endef
 
 define Package/asterisk14-xip-debug
@@ -1206,7 +1208,11 @@ endef
 
 define Package/asterisk14-xip-core/postinst
 #!/bin/sh
-ROOT=`echo $${PKG_ROOT} | sed 's:[\/]:\\\&:g' -`
+if [ -z "${IPKG_INSTROOT}" ] ; then
+  ROOT=/
+else
+  ROOT=`echo $${PKG_ROOT} | sed 's:[\/]:\\\&:g' -`
+fi
 /bin/sed -i 's/\ \/etc/\ '$${ROOT}'etc/g' $${PKG_ROOT}/etc/asterisk/asterisk.conf
 /bin/sed -i 's/\ \/var\/spool/\ '$${ROOT}'var\/spool/g' $${PKG_ROOT}/etc/asterisk/asterisk.conf
 /bin/sed -i 's/\ \/var\/log/\ '$${ROOT}'var\/log/g' $${PKG_ROOT}/etc/asterisk/asterisk.conf
@@ -1222,12 +1228,16 @@ ln -s ../../../usr/lib/asterisk/uci/lastcall      25-lastcall
 ln -s ../../../usr/lib/asterisk/uci/meetmeconf    30-meetme
 ln -s ../../../usr/lib/asterisk/uci/sipiaxconf    35-sipiax
 ln -s ../../../usr/lib/asterisk/uci/talkclock     40-talkclock
+ln -s ../../../usr/lib/asterisk/uci/voicemenu     45-voicemenu
+ln -s ../../../usr/lib/asterisk/uci/disaconf      50-disaconf
 endef
 
 define Package/asterisk14-xip/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk
 endef
 
 define Package/asterisk14-xip-mini/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk
 endef
 
 define Package/asterisk14-xip-app-meetme/conffiles
@@ -1749,7 +1759,7 @@ endef
 
 define Package/asterisk14-xip-channel/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	for f in app_chanisavail app_channelredirect app_chanspy func_channel app_softhangup app_directed_pickup ; do \
+	for f in app_chanisavail app_channelredirect app_chanspy func_channel app_softhangup app_directed_pickup app_pickup2 ; do \
 	  $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$$$f.so $(1)/usr/lib/asterisk/modules/ ; \
 	done
 endef