From fa7fa6173855ebb9ca01d37e611eeaac8ad6ec53 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 4 Feb 2012 20:49:50 +0000
Subject: [PATCH] [packages_10.03.2] bzip2: merge r28228

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30138 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 utils/bzip2/Makefile | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/utils/bzip2/Makefile b/utils/bzip2/Makefile
index a9d58a5..1cdfaa4 100644
--- a/utils/bzip2/Makefile
+++ b/utils/bzip2/Makefile
@@ -17,37 +17,60 @@ PKG_MD5SUM:=00b516f4704d4a7cb50a1d97e6e8e15b
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/libbz2
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=
+  TITLE:=bzip2 library.
+  URL:=http://www.bzip.org/
+endef
+
+define Package/libbz2/description
+	bzip2 is a freely available, patent free, high-quality
+	data compressor. This packages provides libbz2 library.
+endef
+
 define Package/bzip2
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=
+  DEPENDS:=+libbz2
   TITLE:=bzip2 is a compression utility.
   URL:=http://www.bzip.org/
 endef
 
 define Package/bzip2/description
 	bzip2 is a freely available, patent free, high-quality
-	data compressor.
+	data compressor. This package provides the binary.
 endef
 
 TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += --prefix=/usr
 
 MAKE_FLAGS += \
+	-f Makefile-libbz2_so \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDLAGS)" \
-	bzip2 \
+	all
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_BUILD_DIR)/bzlib.h $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libbz2.a $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbz2.so.$(PKG_VERSION) $(1)/usr/lib/
+	$(LN) libbz2.so.$(PKG_VERSION) $(1)/usr/lib/libbz2.so.1.0
+	$(LN) libbz2.so.$(PKG_VERSION) $(1)/usr/lib/libbz2.so
+endef
+
+define Package/libbz2/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbz2.so.$(PKG_VERSION) $(1)/usr/lib/
+	$(LN) libbz2.so.$(PKG_VERSION) $(1)/usr/lib/libbz2.so.1.0
 endef
 
 define Package/bzip2/install
 	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bzip2-shared $(1)/usr/bin/bzip2
 endef
 
+$(eval $(call BuildPackage,libbz2))
 $(eval $(call BuildPackage,bzip2))
-- 
2.11.0