sync 8.09 with changes from trunk

[openwrt/svn-archive/archive.git] / package / nvram / Makefile

diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index e053a43b20fd7b8ac8bad166fc95266d80474a48..ec20de2cb42ffc7d06e0f976b5eb73296d896c40 100644 (file)
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/nvram
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@TARGET_BRCM_2_4
+  DEPENDS:=@TARGET_brcm_2_4
   TITLE:=Broadcom config utility
 endef
 
@@ -29,20 +29,18 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)
 endef
 
-define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(STAGING_DIR)/usr/lib/
-endef
+TARGET_CFLAGS += $(FPIC)
 
-define Build/UninstallDev
-       rm -f $(STAGING_DIR)/usr/lib/lib{nvram,shared}*.so
+define Build/InstallDev
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/libnvram*.so $(1)/usr/lib/
 endef
 
 define Package/nvram/install
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/libnvram*.so $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/
 endef