update to newer version, fix compile issues, 100-wpa_fix.patch removed, is it needed?

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

diff --git a/openwrt/package/nvram/Makefile b/openwrt/package/nvram/Makefile
index 337f722..dd460fc 100644 (file)
--- a/openwrt/package/nvram/Makefile
+++ b/openwrt/package/nvram/Makefile
@@ -9,20 +9,14 @@ 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:
        mkdir -p $(PKG_BUILD_DIR)
 $(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.prepared:
        mkdir -p $(PKG_BUILD_DIR)

-       cp -a ./src/* $(PKG_BUILD_DIR)
+       $(CP) ./src/* $(PKG_BUILD_DIR)
+       touch $@
+
+$(PKG_BUILD_DIR)/.configured:

        touch $@
 
 $(PKG_BUILD_DIR)/.built:
        touch $@
 
 $(PKG_BUILD_DIR)/.built:


@@ -33,16 +27,16 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_NVRAM):
        mkdir -p $(IDIR_NVRAM)/usr/lib
 
 $(IPKG_NVRAM):
        mkdir -p $(IDIR_NVRAM)/usr/lib

-       cp $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib

        mkdir -p $(IDIR_NVRAM)/usr/sbin
        mkdir -p $(IDIR_NVRAM)/usr/sbin

-       cp $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin

        $(RSTRIP) $(IDIR_NVRAM)
        $(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR)
 
 
        $(RSTRIP) $(IDIR_NVRAM)
        $(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
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib