[packages] fwknop: update to 2.0.0rc4

[openwrt/svn-archive/archive.git] / libs / wxbase / Makefile

diff --git a/libs/wxbase/Makefile b/libs/wxbase/Makefile
index 86f3177fcb400a11cacb77fdb3a4a8035e40d5a5..1136c9f60634d70be25ba86fce4142c7ac716524 100644 (file)
--- a/libs/wxbase/Makefile
+++ b/libs/wxbase/Makefile
@@ -17,6 +17,8 @@ PKG_MD5SUM:=88b867bc118a183af56efc67014bdf27
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libwxbase
@@ -113,18 +115,11 @@ else
   LIB_PFX:=
 endif
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 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 +127,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))