From e1e56a0d326e753654a224e012d2d38142107cbc Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 12 Apr 2010 23:19:08 +0200 Subject: asterisk: default astdatadir to /usr/lib/asterisk This is needed in order for asterisk to find the sound files we provide (and I found adding a symlink from the sounds dir to /var/lib/asterisk/ being just too ugly). As it changes only the default configuration, I guess this is fine without increasing PKG_RELEASE. --- package/asterisk/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/asterisk') diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index c35e686a5..c7ec0c0fa 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -174,6 +174,7 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} rm -f gtalk.conf ; \ rm -f skinny.conf ; \ rm -f dundi.conf ; \ + echo -e '/^astdatadir =/s/var/usr/\nwq\n' | ed asterisk.conf ; \ ) ${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/ $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \ -- cgit v1.2.3 From ed46beee877b0f659fa83049ecb0e50885a41257 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 12 Apr 2010 23:37:17 +0200 Subject: asterisk-sounds: do not install useless files Still leave that sounds.xml in there, as I'm not sure what it is for. And besides, with 5k of plain text size it shouldn't hurt too much if you already have space for the sounds package. :) --- package/asterisk/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'package/asterisk') diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index c7ec0c0fa..a6b3ef4a6 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -192,8 +192,11 @@ asterisk-sounds-install: ${INSTALL_DIR} $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds $(CP) $(WRKBUILD)/sounds/* \ $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/ - rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3 - rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/vm-* + (cd $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds; \ + rm -f *.mp3 vm-*; \ + rm -f CHANGES* CREDITS* LICENSE* *.txt ; \ + rm -f *.tar.gz Makefile ; \ + ) asterisk-voicemail-install: ${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk -- cgit v1.2.3