merge the control file and the .ipk file targets into one to prevent them from going...

[openwrt.git] / package / mtd / Makefile

diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index 01b9adf..3561a9b 100644 (file)
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -4,24 +4,26 @@
 # 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$

 
 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk

+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=mtd
 
 PKG_NAME:=mtd

-PKG_RELEASE:=4
+PKG_RELEASE:=8

 
 

-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME)

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mtd
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mtd

-SECTION:=base
-CATEGORY:=Utilities
-DEFAULT:=y
-TITLE:=Update utility for trx firmware images
-DESCRIPTION:=Update utility for trx firmware images. To update \\\
-from other firmware or older OpenWrt releases.
+  SECTION:=utils
+  CATEGORY:=Base system
+  TITLE:=Update utility for trx firmware images
+endef
+
+define Package/mtd/description
+ This package contains an utility useful to upgrade from other firmware or 
+ older OpenWrt releases.

 endef
 
 define Build/Prepare
 endef
 
 define Build/Prepare


@@ -29,9 +31,18 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 

+target=$(firstword $(subst -, ,$(BOARD)))
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               TARGET=$(target) \
+               CFLAGS="$(TARGET_CFLAGS) -Dtarget_$(target)=1 -Wall"
+endef
+

 define Package/mtd/install
 define Package/mtd/install

-       install -d -m0755 $(1)/sbin
-       install -m0755 $(PKG_BUILD_DIR)/mtd $(1)/sbin/
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/mtd $(1)/sbin/

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