From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 4 Feb 2012 18:32:44 +0000 (+0000)
Subject: [packages_10.03.2] libevent: merge r28537
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=03c8dd9650a4f4bf2362a8b9c58ae787fc753cd1;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.2] libevent: merge r28537

SVN-Revision: 30047
---

diff --git a/libs/libevent/Makefile b/libs/libevent/Makefile
index ba8aec26f5..45a6d3e914 100644
--- a/libs/libevent/Makefile
+++ b/libs/libevent/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libevent
 PKG_VERSION:=1.4.14b
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable.tar.gz
@@ -54,13 +54,12 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.{la,a,so} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-1.4.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so} $(1)/usr/lib/
 endef
 
 define Package/libevent/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-1.4.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libevent))