asterisk11: change some default file locations

[feed/telephony.git] / net / asterisk-11.x / Makefile

diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index b856fb46d83194333bed323afa8397c87d1ef746..fc907f2ac3552be0bc82c199a86add3b990e5dbd 100644 (file)
--- a/net/asterisk-11.x/Makefile
+++ b/net/asterisk-11.x/Makefile
@@ -47,8 +47,8 @@ define Package/asterisk11/install/sbin
 endef
 
 define Package/asterisk11/install/sounds
-       $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/$(2) $(1)/usr/lib/asterisk/sounds/
+       $(INSTALL_DIR) $(1)/usr/share/asterisk/sounds/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/asterisk/sounds/en/$(2) $(1)/usr/share/asterisk/sounds/
 endef
 
 define Package/$(PKG_NAME)/config
@@ -162,10 +162,10 @@ This package provides sounds for Asterisk11.
 endef
 
 define Package/asterisk11-sounds/install
-       $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/* $(1)/usr/lib/asterisk/sounds/
-       rm -f $(1)/usr/lib/asterisk/sounds/vm-*
-       rm -f $(1)/usr/lib/asterisk/sounds/conf-*
+       $(INSTALL_DIR) $(1)/usr/share/asterisk/sounds/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/asterisk/sounds/en/* $(1)/usr/share/asterisk/sounds/
+       rm -f $(1)/usr/share/asterisk/sounds/vm-*
+       rm -f $(1)/usr/share/asterisk/sounds/conf-*
 endef
 
 ifneq ($(CONFIG_PACKAGE_asterisk11-chan-dahdi),)
@@ -340,10 +340,7 @@ define Build/Compile
        ASTCFLAGS="$(EXTRA_CFLAGS)" \
        ASTLDFLAGS="$(EXTRA_LDFLAGS)" \
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               ASTVARLIBDIR="/usr/lib/asterisk" \
-               ASTDATADIR="/usr/lib/asterisk" \
-               ASTKEYDIR="/usr/lib/asterisk" \
-               ASTDBDIR="/usr/lib/asterisk" \
+               ASTDATADIR="/usr/share/asterisk" \
                NOISY_BUILD="yes" \
                DEBUG="" \
                OPTIMIZE="" \