improve dependency handling, fix some package makefile bugs

[openwrt-10.03/.git] / package / nvram / Makefile

diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index f7312fe18b34656197253a39f95c048756a2650e..9cc6b9997abcd29929af99920fb7081493ca4b43 100644 (file)
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -9,38 +9,28 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
-# does not depend on menuconfig
-ifneq ($(BOARD)-$(KERNEL),brcm-2.4)
-BR2_PACKAGE_NVRAM:=m
-else
-BR2_PACKAGE_NVRAM:=y
-endif
-
-$(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.prepared:
+define Package/nvram
+SECTION:=base
+DEPENDS:=@LINUX_2_4_BRCM
+TITLE:=Broadcom config utility
+DESCRIPTION:=control utility for broadcom's 'nvram' config area
+endef
+
+define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
-       cp -a ./src/* $(PKG_BUILD_DIR)
-       touch $@
-
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include"
-       touch $@
-
-$(IPKG_NVRAM):
-       mkdir -p $(IDIR_NVRAM)/usr/lib
-       cp $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib
-       mkdir -p $(IDIR_NVRAM)/usr/sbin
-       cp $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin
-       $(RSTRIP) $(IDIR_NVRAM)
-       $(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR)
-
-
-compile: install-dev
-install-dev:
+       $(CP) ./src/* $(PKG_BUILD_DIR)
+endef
+
+define Package/nvram/install
+       install -d -m0755  $(1)/usr/lib
+       install -d -m0755 $(1)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib
+       install -m0755 $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin
+endef
+
+compile-targets: install-dev
+install-dev: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib