patch nvram library for new nas version (thx to Vincent Bernat)

[openwrt.git] / package / nvram / Makefile

diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index 337f722..3e4c2d3 100644 (file)
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -9,15 +9,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
 
 include $(TOPDIR)/package/rules.mk
 

-# does not depend on menuconfig
-ifneq ($(BOARD),brcm)
-BR2_PACKAGE_NVRAM:=m
-else
-ifeq ($(LINUX_VERSION),2.4.30)
-BR2_PACKAGE_NVRAM:=y
-endif
-endif
-

 $(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.prepared:
 $(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.prepared:


@@ -25,6 +16,9 @@ $(PKG_BUILD_DIR)/.prepared:
        cp -a ./src/* $(PKG_BUILD_DIR)
        touch $@
 
        cp -a ./src/* $(PKG_BUILD_DIR)
        touch $@
 

+$(PKG_BUILD_DIR)/.configured:
+       touch $@
+

 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \


@@ -40,8 +34,8 @@ $(IPKG_NVRAM):
        $(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR)
 
 
        $(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR)
 
 

-compile: install-dev
-install-dev:
+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
        
        mkdir -p $(STAGING_DIR)/usr/lib
        cp $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib