fix cgi-bin directory handling (#1764)

[openwrt.git] / package / nvram / Makefile

diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index b7040de..87e8b06 100644 (file)
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -16,10 +16,13 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nvram
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nvram

-SECTION:=base
-DEPENDS:=@LINUX_2_4_BRCM
-TITLE:=Broadcom config utility
-DESCRIPTION:=control utility for broadcom's 'nvram' config area
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=@LINUX_2_4_BRCM
+  TITLE:=Broadcom config utility
+  DESCRIPTION:=\
+       This package contains an utility to control broadcom's 'nvram' config \\\
+       area.

 endef
 
 define Build/Prepare
 endef
 
 define Build/Prepare


@@ -27,13 +30,6 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)
 endef
 
        $(CP) ./src/* $(PKG_BUILD_DIR)
 endef
 

-define Package/nvram/install
-       install -d -m0755 $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(1)/usr/lib/
-       install -d -m0755 $(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/
-endef
-

 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(STAGING_DIR)/usr/lib/
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(STAGING_DIR)/usr/lib/


@@ -43,4 +39,11 @@ define Build/UninstallDev
        rm -f $(STAGING_DIR)/usr/lib/lib{nvram,shared}*.so
 endef
 
        rm -f $(STAGING_DIR)/usr/lib/lib{nvram,shared}*.so
 endef
 

+define Package/nvram/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/
+endef
+

 $(eval $(call BuildPackage,nvram))
 $(eval $(call BuildPackage,nvram))