[packages] openvpn: stop instances even if they are disabled (#9404)

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

diff --git a/libs/wxbase/Makefile b/libs/wxbase/Makefile
index e8e70a82744d645e3f67ee4e9e2b65ecbb49f435..1136c9f60634d70be25ba86fce4142c7ac716524 100644 (file)
--- a/libs/wxbase/Makefile
+++ b/libs/wxbase/Makefile
@@ -8,15 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wxbase
-PKG_VERSION:=2.8.7
-PKG_RELEASE:=3
+PKG_VERSION:=2.8.10
+PKG_RELEASE:=1
 
 PKG_SOURCE:=wxGTK-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/wxwindows
-PKG_MD5SUM:=b25e85eeee524903214ebb520753f4bd
+PKG_MD5SUM:=88b867bc118a183af56efc67014bdf27
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libwxbase
@@ -106,25 +108,18 @@ CONFIGURE_ARGS+= \
 UNICODE=yes
 
 ifeq ($(UNICODE),yes)
-CONFIGURE_ARGS += --enable-unicode
-LIB_PFX:=u
+  CONFIGURE_ARGS+= --enable-unicode
+  LIB_PFX:=u
 else
-CONFIGURE_ARGS += --disable-unicode
-LIB_PFX:=
+  CONFIGURE_ARGS+= --disable-unicode
+  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))