Changeset 9750


Ignore:
Timestamp:
2007-12-14T07:01:52+01:00 (8 years ago)
Author:
ryd
Message:
  • removing mod_tas
  • fix MacOSX compiling issue
File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/olsrd/Makefile

    r9486 r9750  
    8585endef 
    8686 
    87 define Package/olsrd-mod-tas 
    88   $(call Package/olsrd/template) 
    89   DEPENDS:=olsrd 
    90   TITLE:=Tiny Application Server (TAS) plugin 
    91 endef 
    92  
    9387define Build/Configure 
    9488endef 
     
    107101                ETCDIR="$(PKG_INSTALL_DIR)/etc" \ 
    108102                MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \ 
    109                 STRIP="/bin/true" \ 
     103                STRIP="true" \ 
     104                INSTALL_LIB="true" \ 
     105                SUBDIRS="bmf dot_draw dyn_gw httpinfo nameservice secure txtinfo" \ 
    110106                all libs install install_libs 
    111107endef 
     
    114110        $(INSTALL_DIR) $(1)/etc/config 
    115111        $(INSTALL_DATA) ./files/olsr.config $(1)/etc/config/olsr 
    116         $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/olsrd.conf $(1)/etc/ 
     112        $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/cfgparser/olsrd.conf.example $(1)/etc/olsrd.conf 
    117113        $(INSTALL_DIR) $(1)/usr/sbin 
    118         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(1)/usr/sbin/ 
     114        $(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/ 
    119115        $(INSTALL_DIR) $(1)/etc/init.d 
    120116        $(INSTALL_BIN) ./files/olsrd.init $(1)/etc/init.d/olsrd 
     
    123119define Package/olsrd-mod-dot-draw/install 
    124120        $(INSTALL_DIR) $(1)/usr/lib 
    125         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_dot_draw.so.* $(1)/usr/lib/ 
     121        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dot_draw/olsrd_dot_draw.so.* $(1)/usr/lib/ 
    126122endef 
    127123 
    128124define Package/olsrd-mod-bmf/install 
    129125        $(INSTALL_DIR) $(1)/usr/lib 
    130         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_bmf.so.* $(1)/usr/lib/ 
     126        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmf/olsrd_bmf.so.* $(1)/usr/lib/ 
    131127endef 
    132128 
    133129define Package/olsrd-mod-dyn-gw/install 
    134130        $(INSTALL_DIR) $(1)/usr/lib 
    135         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_dyn_gw.so.* $(1)/usr/lib/ 
     131        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dyn_gw/olsrd_dyn_gw.so.* $(1)/usr/lib/ 
    136132endef 
    137133 
    138134define Package/olsrd-mod-httpinfo/install 
    139135        $(INSTALL_DIR) $(1)/usr/lib 
    140         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_httpinfo.so.* $(1)/usr/lib/ 
     136        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/httpinfo/olsrd_httpinfo.so.* $(1)/usr/lib/ 
    141137endef 
    142138 
    143139define Package/olsrd-mod-nameservice/install 
    144140        $(INSTALL_DIR) $(1)/usr/lib 
    145         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_nameservice.so.* $(1)/usr/lib/ 
     141        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/nameservice/olsrd_nameservice.so.* $(1)/usr/lib/ 
    146142endef 
    147143 
     
    150146        $(CP) ./files/olsrd_secure_key $(1)/etc/olsrd.d/ 
    151147        $(INSTALL_DIR) $(1)/usr/lib 
    152         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_secure.so.* $(1)/usr/lib/ 
    153 endef 
    154  
    155 define Package/olsrd-mod-tas/install 
    156         $(INSTALL_DIR) $(1)/usr/lib 
    157         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_tas.so.* $(1)/usr/lib/ 
     148        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/secure/olsrd_secure.so.* $(1)/usr/lib/ 
    158149endef 
    159150 
    160151define Package/olsrd-mod-txtinfo/install 
    161152        $(INSTALL_DIR) $(1)/usr/lib 
    162         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/olsrd_txtinfo.so.* $(1)/usr/lib/ 
     153        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/txtinfo/olsrd_txtinfo.so.* $(1)/usr/lib/ 
    163154endef 
    164  
    165  
    166155 
    167156$(eval $(call BuildPackage,olsrd)) 
     
    172161$(eval $(call BuildPackage,olsrd-mod-nameservice)) 
    173162$(eval $(call BuildPackage,olsrd-mod-secure)) 
    174 $(eval $(call BuildPackage,olsrd-mod-tas)) 
    175163$(eval $(call BuildPackage,olsrd-mod-txtinfo)) 
Note: See TracChangeset for help on using the changeset viewer.