add $(STAGING_DIR) as argument to the InstallDev template and update packages accordi...

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index afdaa77..927c350 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -22,44 +22,51 @@ include $(INCLUDE_DIR)/package.mk
 define Package/fuse/Default
   TITLE:=FUSE
   DEPENDS:=@LINUX_2_6
-  DESCRIPTION:=\
-       FUSE (Filesystem in UserSpacE)
   URL:=http://fuse.sourceforge.net/
 endef
 
+define Package/fuse/Default/description
+ FUSE (Filesystem in UserSpacE)
+endef
+
 define Package/fuse-utils
-  $(call Package/fuse/Default)
+$(call Package/fuse/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6
   TITLE+= (utilities)
-  DESCRIPTION+=\\\
-       \\\
-       This package contains the FUSE utilities.
+endef
+
+define Package/fuse-utils/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE utilities.
 endef
 
 define KernelPackage/fuse
+$(call Package/fuse/Default)
   SUBMENU:=Filesystems
-  $(call Package/fuse/Default)
   DEPENDS:=@LINUX_2_6
   TITLE+= (kernel module)
-  DESCRIPTION+=\\\
-       \\\
-       This package contains the FUSE kernel module.
   FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   AUTOLOAD:=$(call AutoLoad,80,fuse)
 endef
 
+define Kernel/Package/fuse/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE kernel module.
+endef
+
 define Package/libfuse
-  $(call Package/fuse/Default)
+$(call Package/fuse/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=@LINUX_2_6
   TITLE+= (library)
-  DESCRIPTION+=\\\
-       \\\
-       This package contains the FUSE shared library, needed by other programs.
+endef
+
+define Package/libfuse/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE shared library, needed by other programs.
 endef
 
 CONFIGURE_VARS += \
@@ -99,20 +106,20 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(STAGING_DIR)/usr/lib/
-       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir}/fuse,,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+       mkdir -p $(1)/usr/include
+       $(CP)   $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(1)/usr/lib/
+       mkdir -p $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/
+       $(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc
+       $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc
 endef
        
 define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/fuse{,.h} \
-               $(STAGING_DIR)/usr/lib/libfuse.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+       rm -rf  $(1)/usr/include/fuse{,.h} \
+               $(1)/usr/lib/libfuse.{a,so*} \
+               $(1)/usr/lib/pkgconfig/fuse.pc
 endef
 
 define Package/fuse-utils/install