From: Nicolas Thill Date: Fri, 18 Dec 2009 18:46:38 +0000 (+0000) Subject: wxbase: fix build with native toolchain X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=07802d9e51fed226341838bb1fb2f839bf5975a9;p=openwrt%2Fsvn-archive%2Fpackages.git wxbase: fix build with native toolchain SVN-Revision: 18836 --- diff --git a/libs/wxbase/Makefile b/libs/wxbase/Makefile index 86f3177fc..1913f4e47 100644 --- a/libs/wxbase/Makefile +++ b/libs/wxbase/Makefile @@ -123,8 +123,7 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-2.8-*.so $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-2.8.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/ $(SED) 's,-I$$$${includedir}/wx-2.8,-I$(STAGING_DIR)/usr/include/wx-2.8,g' $(1)/usr/bin/wx-config $(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config @@ -132,7 +131,7 @@ endef define Package/libwxbase/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-2.8.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libwxbase))