[packages] massive: use $(INSTALL_DIR) instead of 'mkdir -p' in install and InstallDev

[packages.git] / utils / bzip2 / Makefile

diff --git a/utils/bzip2/Makefile b/utils/bzip2/Makefile
index f49cd79..289d704 100644 (file)
--- a/utils/bzip2/Makefile
+++ b/utils/bzip2/Makefile
@@ -1,22 +1,19 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2008 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.4
+PKG_VERSION:=1.0.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.bzip.org/$(PKG_VERSION)/
-PKG_MD5SUM:=fc310b254f6ba5fbb5da018f04533688
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://www.bzip.org/$(PKG_VERSION)
+PKG_MD5SUM:=3c15a0c8d1d3ee1c46a1634d00617b1a
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,29 +25,29 @@ define Package/bzip2
   URL:=http://www.bzip.org/
 endef
 
-define Package/dmidecode/description
-       bzip2 is a freely available, patent free, high-quality \
+define Package/bzip2/description
+       bzip2 is a freely available, patent free, high-quality
        data compressor.
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --prefix=/usr \
-       );
-endef
+TARGET_CFLAGS += $(FPIC)
+CONFIGURE_ARGS += --prefix=/usr
 
-define Build/Compile
-       $(call Build/Compile/Default, \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               LDFLAGS="$(TARGET_LDLAGS)" \
-               bzip2 \
-        )
+MAKE_FLAGS += \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       LDFLAGS="$(TARGET_LDLAGS)" \
+       bzip2 \
+
+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/
 endef
 
 define Package/bzip2/install
-       mkdir -p $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/bzip2 $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,bzip2))
-