Ignore:
Timestamp:
2011-03-21T17:45:31+01:00 (5 years ago)
Author:
cshore
Message:

[net] Telephony: Yate: Fixed build problems that prevented server modules from loading. (Must not use libtool fixup). Also added copy of SNMP files to /usr/share/yate/data as is expected when the ysnmpagent module is installed. Also switched to using PKG_INSTALL instead of copying object from source/build tree.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/yate/Makefile

    r26219 r26256  
    2020PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
    2121 
    22 PKG_FIXUP = libtool 
     22PKG_INSTALL:=1 
    2323 
    2424include $(INCLUDE_DIR)/package.mk 
     
    7575         
    7676        for yatelib in "" sig mgcp jabber; do \ 
    77                 $(INSTALL_BIN) $(PKG_BUILD_DIR)/libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib ;\ 
     77                $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib ;\ 
    7878                $(LN) ./libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib/libyate$$$${yatelib}.so ;\ 
    7979        done 
    8080         
    8181        $(INSTALL_DIR) $(1)/usr/bin 
    82         $(INSTALL_BIN) $(PKG_BUILD_DIR)/yate $(1)/usr/bin/ 
     82        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/yate $(1)/usr/bin/ 
    8383        $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) 
    84         $(INSTALL_DATA) $(PKG_BUILD_DIR)/conf.d/yate.conf.sample $(1)/etc/$(PKG_NAME)/yate.conf 
     84        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/yate/yate.conf    $(1)/etc/$(PKG_NAME)/yate.conf 
     85endef 
     86 
     87define Build/InstallDev 
     88        $(INSTALL_DIR) $(STAGING_DIR)/usr/include 
     89        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ 
     90        $(INSTALL_DIR) $(STAGING_DIR)/usr/lib 
     91        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib/ 
    8592endef 
    8693 
     
    104111  define Package/$(PKG_NAME)-mod-$(1)/install 
    105112        $$(INSTALL_DIR) $$(1)/usr/lib/yate/$(2) 
    106         $$(INSTALL_BIN) $$(PKG_BUILD_DIR)/modules/$(2)/$(1).yate $$(1)/usr/lib/yate/$(2)/$(1).yate 
    107         if [ -f $$(PKG_BUILD_DIR)/conf.d/$(1).conf.sample ]; then \ 
     113        $$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/yate/$(2)/$(1).yate $$(1)/usr/lib/yate/$(2)/$(1).yate 
     114        if [ -f $$(PKG_INSTALL_DIR)/etc/yate/$(1).conf ]; then \ 
    108115                $$(INSTALL_DIR) $$(1)/etc/yate ;\ 
    109                 $$(INSTALL_DATA) $$(PKG_BUILD_DIR)/conf.d/$(1).conf.sample $$(1)/etc/yate/$(1).conf ;\ 
     116                $$(INSTALL_DATA) $$(PKG_INSTALL_DIR)/etc/yate/$(1).conf $$(1)/etc/yate/ ;\ 
    110117        fi 
     118        $(if $(5),$(foreach extra_file,$(5),\ 
     119                $(INSTALL_DIR) $$(1)$(dir $(extra_file)) ; \ 
     120                $(CP) $(PKG_INSTALL_DIR)$(extra_file) $$(1)$(extra_file) ; \ 
     121        ),) 
    111122  endef 
    112123 
     
    186197$(eval $(call BuildPlugin,ysipchan,,SIP Channel,)) 
    187198$(eval $(call BuildPlugin,ysockschan,,SOCKS Channel,)) 
    188 $(eval $(call BuildPlugin,ysnmpagent,server,SNMP Protocol Agent,)) 
     199$(eval $(call BuildPlugin,ysnmpagent,server,SNMP Protocol Agent,,/usr/share/yate/data/NULL-TEAM-MIB.txt /usr/share/yate/data/snmp_mib.conf /usr/share/yate/data/YATE-MIB.txt)) 
    189200$(eval $(call BuildPlugin,ystunchan,,STUN Support,)) 
    190201$(eval $(call BuildPlugin,zapcard,server,Zaptel Card Signalling and Data Driver,+zaptel14-libtonezone)) 
Note: See TracChangeset for help on using the changeset viewer.