mac80211: reorganize patches, fold in patches that were merged upstream

[openwrt.git] / package / libreadline / Makefile

diff --git a/package/libreadline/Makefile b/package/libreadline/Makefile
index 1ded278..90219e5 100644 (file)
--- a/package/libreadline/Makefile
+++ b/package/libreadline/Makefile
@@ -4,13 +4,12 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=readline
 PKG_VERSION:=5.2
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=readline
 PKG_VERSION:=5.2

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/readline
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/readline


@@ -53,15 +52,15 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include

        $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/

-       mkdir -p $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so*} $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so,so.5,so.5.2} $(1)/usr/lib/

 endef
 
 define Package/libreadline/install
        $(INSTALL_DIR) $(1)/usr/lib
 endef
 
 define Package/libreadline/install
        $(INSTALL_DIR) $(1)/usr/lib

-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{so,so.5,so.5.2} $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,libreadline))
 endef
 
 $(eval $(call BuildPackage,libreadline))