From 81479f636cf9650bdaa658fb13ba7d027cf30f8d Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 28 Nov 2007 19:43:12 +0000
Subject: [PATCH] move bzip2 library installation to utils/bzip2 package to
 avoid redundancy and package/symlinks failures

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9622 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 libs/bzip2/Makefile  | 49 -------------------------------------------------
 utils/bzip2/Makefile | 13 +++++++++++++
 2 files changed, 13 insertions(+), 49 deletions(-)
 delete mode 100644 libs/bzip2/Makefile

diff --git a/libs/bzip2/Makefile b/libs/bzip2/Makefile
deleted file mode 100644
index 7c42adf0f..000000000
--- a/libs/bzip2/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bzip2
-PKG_VERSION:=1.0.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.bzip.org/$(PKG_VERSION)/
-PKG_MD5SUM:=8a716bebecb6e647d2e8a29ea5d8447f
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libbzip2
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=bzip2 is a freely available, patent free, high-quality data compressor.
-  URL:=http://www.bzip.org/
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		libbz2.a
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/bzlib.h $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libbz2.a $(1)/usr/lib/
-endef
-	
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/bzlib.h \
-		$(STAGING_DIR)/usr/lib/libbz2.a
-endef
-
-$(eval $(call BuildPackage/libbzip2))
diff --git a/utils/bzip2/Makefile b/utils/bzip2/Makefile
index f49cd7903..540acca87 100644
--- a/utils/bzip2/Makefile
+++ b/utils/bzip2/Makefile
@@ -47,6 +47,19 @@ define Build/Compile
         )
 endef
 
+define Build/InstallDev
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/bzlib.h $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libbz2.a $(1)/usr/lib/
+endef
+
+define Build/UninstallDev
+	rm -rf \
+		$(STAGING_DIR)/usr/include/bzlib.h \
+		$(STAGING_DIR)/usr/lib/libbz2.a
+endef
+
 define Package/bzip2/install
 	mkdir -p $(1)/usr/bin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bzip2 $(1)/usr/bin/
-- 
2.11.0