Changeset 35756


Ignore:
Timestamp:
2013-02-23T13:05:29+01:00 (5 years ago)
Author:
mazilo
Message:

fixed sound packages.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/freeswitch/Makefile

    r35556 r35756  
    1919PKG_SOURCE_PROTO:=git 
    2020PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git 
    21 FS_DEFAULT_HEAD:=475c235df44abe956ccfff050ec04f1f4578e6c1 
     21FS_DEFAULT_HEAD:=3e31837a0bb417a328d9877647bbb1bb2ed51b5f 
    2222FS_LATEST_HEAD:=$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1) 
    2323PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_SOFIA_WITH_PULL_CURRENT),$(FS_LATEST_HEAD),$(FS_DEFAULT_HEAD)) 
     
    374374$(call Package/$(PKG_NAME)/Default) 
    375375  TITLE:=FreeSWITCH 16KHz english sounds 
    376   DEPENDS:= $(PKG_NAME) $(PKG_NAME)-sounds-en-08KHz 
     376  DEPENDS:= +$(PKG_NAME)-sounds-en-08KHz 
    377377endef 
    378378 
     
    381381$(call Package/$(PKG_NAME)/Default) 
    382382  TITLE:=FreeSWITCH 32KHz english sounds 
    383   DEPENDS:= $(PKG_NAME) $(PKG_NAME)-sounds-en-08KHz $(PKG_NAME)-sounds-en-16KHz 
     383  DEPENDS:= +$(PKG_NAME)-sounds-en-16KHz 
    384384endef 
    385385 
     
    388388$(call Package/$(PKG_NAME)/Default) 
    389389  TITLE:=FreeSWITCH 48KHz english sounds 
    390   DEPENDS:= $(PKG_NAME) $(PKG_NAME)-sounds-en-08KHz $(PKG_NAME)-sounds-en-16KHz $(PKG_NAME)-sounds-en-32KHz 
     390  DEPENDS:= +$(PKG_NAME)-sounds-en-32KHz 
    391391endef 
    392392 
     
    402402$(call Package/$(PKG_NAME)/Default) 
    403403  TITLE:=FreeSWITCH 16KHz music-on-hold sounds 
    404   DEPENDS:= $(PKG_NAME) $(PKG_NAME)-sounds-moh-08KHz 
     404  DEPENDS:= +$(PKG_NAME)-sounds-moh-08KHz 
    405405endef 
    406406 
     
    409409$(call Package/$(PKG_NAME)/Default) 
    410410  TITLE:=FreeSWITCH 32KHz music-on-hold sounds 
    411   DEPENDS:= $(PKG_NAME) $(PKG_NAME)-sounds-moh-08KHz $(PKG_NAME)-sounds-moh-16KHz 
     411  DEPENDS:= +$(PKG_NAME)-sounds-moh-16KHz 
    412412endef 
    413413 
     
    416416$(call Package/$(PKG_NAME)/Default) 
    417417  TITLE:=FreeSWITCH 48KHz music-on-hold sounds 
    418   DEPENDS:= $(PKG_NAME) $(PKG_NAME)-sounds-moh-08KHz $(PKG_NAME)-sounds-moh-16KHz $(PKG_NAME)-sounds-moh-32KHz 
     418  DEPENDS:= +$(PKG_NAME)-sounds-moh-32KHz 
    419419endef 
    420420 
     
    532532 
    533533 
    534 FS_TARGET_CFLAGS:= ${TARGET_CFLAGS} -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format 
    535 FS_TARGET_CXXFLAGS:= ${TARGET_CXXFLAGS} -DLUA_USE_LINUX $(FPIC) -Wno-format 
    536 FS_TARGET_CPPFLAGS:= -I. -I./lua $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),-I$(STAGING_DIR_HOST)/lib/erlang/lib/erl_interface-3.6/include) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) ${TARGET_CPPFLAGS} 
     534FS_TARGET_CFLAGS:= $(TARGET_CFLAGS) -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format 
     535FS_TARGET_CXXFLAGS:= $(TARGET_CXXFLAGS) -DLUA_USE_LINUX $(FPIC) -Wno-format 
     536FS_TARGET_CPPFLAGS:= -I. -I./lua $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),-I$(STAGING_DIR_HOST)/lib/erlang/lib/erl_interface-3.6/include) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) $(TARGET_CPPFLAGS) 
    537537 
    538538 
     
    562562 
    563563CONFIGURE_VARS+= \ 
    564         config_TARGET_CC="$(TOOLCHAIN_DIR)/bin/${TARGET_CC}" \ 
    565         config_TARGET_CFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CFLAGS}" \ 
    566         config_TARGET_CXX="$(TOOLCHAIN_DIR)/bin/${TARGET_CXX}" \ 
    567         config_TARGET_CXXFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CXXFLAGS}" \ 
    568         config_TARGET_CPPFLAGS="${FS_TARGET_CPPFLAGS}" \ 
    569         config_TARGET_READLINE_INC="${FS_TARGET_CPPFLAGS}" \ 
    570         config_TARGET_READLINE_LIBS="${TARGET_LDFLAGS} -lreadline -lncurses" \ 
    571         config_TARGET_LIBS="${TARGET_LDFLAGS} -lpthread -ldl" \ 
    572         config_BUILD_CC="${HOSTCC}" \ 
    573         config_BUILD_CFLAGS="${HOST_CFLAGS}" \ 
    574         CC_FOR_BUILD="${HOSTCC}" \ 
    575         BUILDTOOL_CC="${HOSTCC}" \ 
    576         BUILDTOOL_CCLD="${HOSTCC}" \ 
     564        config_TARGET_CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ 
     565        config_TARGET_CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ 
     566        config_TARGET_CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ 
     567        config_TARGET_CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ 
     568        config_TARGET_CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ 
     569        config_TARGET_READLINE_INC="$(FS_TARGET_CPPFLAGS)" \ 
     570        config_TARGET_READLINE_LIBS="$(TARGET_LDFLAGS) -lreadline -lncurses" \ 
     571        config_TARGET_LIBS="$(TARGET_LDFLAGS) -lpthread -ldl" \ 
     572        config_BUILD_CC="$(HOSTCC)" \ 
     573        config_BUILD_CFLAGS="$(HOST_CFLAGS)" \ 
     574        CC_FOR_BUILD="$(HOSTCC)" \ 
     575        BUILDTOOL_CC="$(HOSTCC)" \ 
     576        BUILDTOOL_CCLD="$(HOSTCC)" \ 
    577577        LDFLAGS="$$$$LDFLAGS" \ 
    578         LDFLAGS_FOR_BUILD="${HOST_LDFLAGS}" \ 
    579         CC="$(TOOLCHAIN_DIR)/bin/${TARGET_CC}" \ 
    580         CXX="$(TOOLCHAIN_DIR)/bin/${TARGET_CXX}" \ 
     578        LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ 
     579        CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ 
     580        CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ 
    581581        AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \ 
    582582        RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \ 
    583         CFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CFLAGS}" \ 
    584         CXXFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CXXFLAGS}" \ 
    585         CPPFLAGS="${FS_TARGET_CPPFLAGS}" \ 
    586         LDFLAGS="${TARGET_LDFLAGS} -Wl,-rpath-link=\"${STAGING_DIR}/usr/lib\"" \ 
    587         PATH="${PATH}:${STAGING_DIR}" \ 
     583        CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ 
     584        CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ 
     585        CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ 
     586        LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib\"" \ 
     587        PATH="$(PATH):$(STAGING_DIR)" \ 
    588588        HOST_CC="/usr/bin/cc" \ 
    589589        HOST_CXX="/usr/bin/g++" \ 
     
    681681        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME)* $(1)/usr/lib/ 
    682682        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc $(1)/usr/lib/pkgconfig/ 
     683        $(if $(1)/usr/lib/$b(PKG_NAME).la,sed -i "s#$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)#/usr#g;s#$(TOOLCHAIN_DIR)/lib##g;s#$(TOOLCHAIN_DIR)##g;s#$(STAGING_DIR)##g;s#$(STAGING_DIR_HOST)##g;s#-L$(PKG_BUILD_DIR)/libs/libzrtp/third_party/bnlib -L$(PKG_BUILD_DIR)/libs/libzrtp ##g;s#-L$(PKG_BUILD_DIR)/libs/apr-util/xml/expat/lib ##g;s#$(PKG_BUILD_DIR)##g" $(1)/usr/lib/lib$(PKG_NAME).la) 
    683684endef 
    684685 
     
    715716 
    716717        # 
    717         # Copying dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml fur_elise.ttml mime.types tetris.ttml tones.conf vars.xml 
    718         # 
    719         $(foreach ff,dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml fur_elise.ttml mime.types tetris.ttml tones.conf vars.xml,$(if ${PKG_BUILD_DIR}/conf/vanilla/$(ff),$(CP) ${PKG_BUILD_DIR}/conf/vanilla/$(ff) $(1)/etc/$(PKG_NAME);)) 
     718        # Copying dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml 
     719        # fur_elise.ttml mime.types tetris.ttml tones.conf vars.xml 
     720        # 
     721        $(foreach f,dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml fur_elise.ttml mime.types tetris.ttml tones.conf vars.xml,$(if $(PKG_BUILD_DIR)/conf/vanilla/$(f),$(CP) $(PKG_BUILD_DIR)/conf/vanilla/$(f) $(1)/etc/$(PKG_NAME);)) 
    720722 
    721723        # 
    722724        # Copying acl ivr modules post_load_modules switch timezones 
    723725        # 
    724         $(foreach ff,acl ivr modules post_load_modules switch timezones,$(if ${PKG_BUILD_DIR}/conf/vanilla/autoload_configs/$(ff).conf.xml,$(CP) ${PKG_BUILD_DIR}/conf/vanilla/autoload_configs/$(ff).conf.xml $(1)/etc/$(PKG_NAME)/autoload_configs;)) 
     726        $(foreach f,acl ivr modules post_load_modules switch timezones,$(if $(PKG_BUILD_DIR)/conf/vanilla/autoload_configs/$(f).conf.xml,$(CP) $(PKG_BUILD_DIR)/conf/vanilla/autoload_configs/$(f).conf.xml $(1)/etc/$(PKG_NAME)/autoload_configs;)) 
    725727endef 
    726728 
    727729 
    728730define Package/$(PKG_NAME)-sounds-en-08KHz/install 
    729         $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds 
    730         $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en $(1)/usr/share/$(PKG_NAME)/sounds/ 
     731        # 
     732        # sounds-en-8KHz 
     733        # 
     734        for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ 
     735        do \ 
     736                [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000; \ 
     737                $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000; \ 
     738        done 
    731739endef 
    732740 
    733741 
    734742define Package/$(PKG_NAME)-sounds-en-16KHz/install 
    735         $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds 
    736         $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en $(1)/usr/share/$(PKG_NAME)/sounds/ 
     743        # 
     744        # sounds-en-16KHz 
     745        # 
     746        for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ 
     747        do \ 
     748                [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000; \ 
     749                $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000; \ 
     750        done 
    737751endef 
    738752 
    739753 
    740754define Package/$(PKG_NAME)-sounds-en-32KHz/install 
    741         $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds 
    742         $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en $(1)/usr/share/$(PKG_NAME)/sounds/ 
     755        # 
     756        # sounds-en-32KHz 
     757        # 
     758        for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ 
     759        do \ 
     760                [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000; \ 
     761                $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000; \ 
     762        done 
    743763endef 
    744764 
    745765 
    746766define Package/$(PKG_NAME)-sounds-en-48KHz/install 
    747         $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds 
    748         $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en $(1)/usr/share/$(PKG_NAME)/sounds/ 
     767        # 
     768        # sounds-en-48KHz 
     769        # 
     770        for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \ 
     771        do \ 
     772                [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000; \ 
     773                $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000; \ 
     774        done 
    749775endef 
    750776 
    751777 
    752778define Package/$(PKG_NAME)-sounds-moh-08KHz/install 
    753         $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds 
    754         $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music $(1)/usr/share/$(PKG_NAME)/sounds/ 
     779        # 
     780        # sounds-moh-8KHz 
     781        # 
     782        [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/8000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/8000; 
     783        $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/8000 $(1)/usr/share/$(PKG_NAME)/sounds/music; 
    755784endef 
    756785 
    757786 
    758787define Package/$(PKG_NAME)-sounds-moh-16KHz/install 
    759         $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds 
    760         $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music $(1)/usr/share/$(PKG_NAME)/sounds/ 
     788        # 
     789        # sounds-moh-16KHz 
     790        # 
     791        [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/16000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/16000; 
     792        $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/16000 $(1)/usr/share/$(PKG_NAME)/sounds/music; 
    761793endef 
    762794 
    763795 
    764796define Package/$(PKG_NAME)-sounds-moh-32KHz/install 
    765         $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds 
    766         $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music $(1)/usr/share/$(PKG_NAME)/sounds/ 
     797        # 
     798        # sounds-moh-32KHz 
     799        # 
     800        [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/32000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/32000; 
     801        $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/32000 $(1)/usr/share/$(PKG_NAME)/sounds/music; 
    767802endef 
    768803 
    769804 
    770805define Package/$(PKG_NAME)-sounds-moh-48KHz/install 
    771         $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds 
    772         $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music $(1)/usr/share/$(PKG_NAME)/sounds/ 
     806        # 
     807        # sounds-moh-48KHz 
     808        # 
     809        [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/48000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/48000; 
     810        $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/48000 $(1)/usr/share/$(PKG_NAME)/sounds/music; 
    773811endef 
    774812 
     
    802840        [ -d "$$(1)/usr/lib/pkgconfig" ] || $(INSTALL_DIR) $$(1)/usr/lib/pkgconfig 
    803841 
    804         $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(patsubst lib%,%,${3}).pc $$(1)/usr/lib/pkgconfig 
    805         $(CP) $(PKG_INSTALL_DIR)/usr/lib/${1}* $$(1)/usr/lib/ 
     842        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(patsubst lib%,%,$(3)).pc $$(1)/usr/lib/pkgconfig 
     843        $(CP) $(PKG_INSTALL_DIR)/usr/lib/$(1)* $$(1)/usr/lib/ 
     844        $(if $$(1)/usr/lib/$(1).la,sed -i "s#$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)#/usr#g;s#$(TOOLCHAIN_DIR)/lib##g;s#$(TOOLCHAIN_DIR)##g;s#$(STAGING_DIR)##g;s#$(STAGING_DIR_HOST)##g;s#-L$(PKG_BUILD_DIR)/libs/libzrtp/third_party/bnlib -L$(PKG_BUILD_DIR)/libs/libzrtp ##g;s#-L$(PKG_BUILD_DIR)/libs/apr-util/xml/expat/lib ##g;s#$(PKG_BUILD_DIR)##g" $$(1)/usr/lib/$(1).la) 
    806845  endef 
    807846 
     
    834873        done 
    835874 
     875        # 
     876        # mod_$(subst -,_,$(1)): Clean installed library control files from referencig to OpenWRT PATH. 
     877        # 
     878        for f in $$(1)/usr/lib/$(PKG_NAME)/mod_$(subst -,_,$(1)).la $$$$(wildcard $$(1)/usr/lib/$(PKG_NAME)/$(4)_*.la); \ 
     879        do \ 
     880                $$(if $$$$$$$${f},sed -i "s#$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)#/usr#g;s#$(TOOLCHAIN_DIR)/lib##g;s#$(TOOLCHAIN_DIR)##g;s#$(STAGING_DIR)##g;s#$(STAGING_DIR_HOST)##g;s#-L$(PKG_BUILD_DIR)/libs/libzrtp/third_party/bnlib -L$(PKG_BUILD_DIR)/libs/libzrtp ##g;s#-L$(PKG_BUILD_DIR)/libs/apr-util/xml/expat/lib ##g;s#$(PKG_BUILD_DIR)##g" $$$$$$$${f}); \ 
     881        done 
     882 
    836883        for f in $(5); \ 
    837884        do \ 
    838                 [ -d "$(dirname $$(1)/usr/${f})" ] || $(INSTALL_DIR) $(dirname $$(1)/usr/${f}); \ 
    839                 $(CP) $(PKG_INSTALL_DIR)/usr/${f} $$(1)/usr/${f}; \ 
     885                [ -d "$(dir $$(1)/usr/$(f))" ] || $(INSTALL_DIR) $(dir $$(1)/usr/$(f)); \ 
     886                $(CP) $(PKG_INSTALL_DIR)/usr/$(f) $$(1)/usr/$(f); \ 
    840887        done 
    841888 
    842889        # 
    843         # 1. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst ${PKG_BUILD_DIR}/%,%,$$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml))) 
    844         # 
    845         $$$$(if $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
    846  
    847         # 
    848         # 2. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst ${PKG_BUILD_DIR}/%,%,$$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml))) 
    849         # 
    850         $$$$(if $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
    851  
    852         # 
    853         # 3. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst ${PKG_BUILD_DIR}/%,%,$$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml))) 
    854         # 
    855         $$$$(if $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
    856  
    857         # 
    858         # 4. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst ${PKG_BUILD_DIR}/%,%,$$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml))) 
    859         # 
    860         $$$$(if $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
    861  
    862         # 
    863         # 5. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst ${PKG_BUILD_DIR}/%,%,$$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml))) 
    864         # 
    865         $$$$(if $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
    866  
    867         # 
    868         # 6. Additional configuration files for mod_$(subst -,_,$(1)) from: $$$$(patsubst ${PKG_BUILD_DIR}/%,%,$$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/conf/$(3)/$(1)/*.$(1)))) 
    869         # 
    870         $$$$(if $$$$(firstword $$$$(wildcard ${PKG_BUILD_DIR}/conf/$(3)/$(1)/*.$(1))),[ -d $$(1)/etc/$(PKG_NAME)/$(1) ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/$(1);$(CP) ${PKG_BUILD_DIR}/conf/$(3)/$(1) $$(1)/etc/$(PKG_NAME)) 
     890        # 1. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml))) 
     891        # 
     892        $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
     893 
     894        # 
     895        # 2. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml))) 
     896        # 
     897        $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
     898 
     899        # 
     900        # 3. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml))) 
     901        # 
     902        $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
     903 
     904        # 
     905        # 4. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml))) 
     906        # 
     907        $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
     908 
     909        # 
     910        # 5. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml))) 
     911        # 
     912        $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs) 
     913 
     914        # 
     915        # 6. Additional configuration files for mod_$(subst -,_,$(1)) from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/$(1)/*.$(1)))) 
     916        # 
     917        $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/$(1)/*.$(1))),[ -d $$(1)/etc/$(PKG_NAME)/$(1) ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/$(1);$(CP) $(PKG_BUILD_DIR)/conf/$(3)/$(1) $$(1)/etc/$(PKG_NAME)) 
    871918  endef 
    872919 
    873920  define Package/$(PKG_NAME)-mod-$(1)/postinst 
    874921#!/bin/sh 
    875 sed -i -e 's|^\([ \t]*\)<!-- *\(.*\)"mod_$(subst -,_,$(1))"\(.*\) *-->\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml 
     922sed -i -e 's|^\([ \t]*\)<!-- *\(.*\)"mod_$(subst -,_,$(1))"\(.*\) *-->\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$$(IPKG_INSTROOT)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml 
    876923  endef 
    877924 
    878925  define Package/$(PKG_NAME)-mod-$(1)/postrm 
    879926#!/bin/sh 
    880 sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1<!-- \2"mod_$(subst -,_,$(1))"\3 -->|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml 
     927sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1<!-- \2"mod_$(subst -,_,$(1))"\3 -->|' $$$$(IPKG_INSTROOT)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml 
    881928  endef 
    882929 
     
    917964$(eval $(call BuildPlugin,avmd,Advanced Voice Mail Detection,vanilla,,,,)) 
    918965$(eval $(call BuildPlugin,blacklist,Blacklist,vanilla,,,,)) 
    919 $(eval $(call BuildPlugin,bv,BroadVoice16 and BroadVoice32 Audio Codec,vanilla,,,,)) 
     966$(eval $(call BuildPlugin,bv,BroadVoice 16/32-bit Audio Codec,vanilla,,,,)) 
    920967$(eval $(call BuildPlugin,callcenter,Call Center,vanilla,,,,)) 
    921968$(eval $(call BuildPlugin,cdr-csv,CSV-CDR Handler,mod,,,,)) # ~/conf 
Note: See TracChangeset for help on using the changeset viewer.