update madwifi to latest version (fixes #2403)

[openwrt.git] / package / e2fsprogs / Makefile

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 9192650..06db69d 100644 (file)
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -18,47 +18,56 @@ PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+define Package/e2fsprogs/Default
+  URL:=http://e2fsprogs.sourceforge.net/
+endef
+

 define Package/e2fsprogs
 define Package/e2fsprogs

+$(call Package/e2fsprogs/Default)

   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ext2/3 filesystem utilities
   DEPENDS:=+libblkid +libuuid
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ext2/3 filesystem utilities
   DEPENDS:=+libblkid +libuuid

-  DESCRIPTION:=\
-       This package contains essential ext2 filesystem utilities which consists of \\\
-       e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 \\\
-       filesystem utilities.
+endef
+
+define Package/e2fsprogs/description
+ This package contains essential ext2 filesystem utilities which consists of 
+ e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 
+ filesystem utilities.

 endef
 
 define Package/libuuid
 endef
 
 define Package/libuuid

+$(call Package/e2fsprogs/Default)

   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=DCE compatible Universally Unique Identifier library
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=DCE compatible Universally Unique Identifier library

-  DESCRIPTION:=\
-               Library for generating DCE compatible Universally Unique Identifiers
-  URL:=http://e2fsprogs.sourceforge.net/
+endef
+
+define Package/libuuid/description
+ Library for generating DCE compatible Universally Unique Identifiers.

 endef
 
 define Package/libblkid
 endef
 
 define Package/libblkid

+$(call Package/e2fsprogs/Default)

   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=block device id library
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=block device id library

-  DESCRIPTION:=\
-       The blkid library which allows system programs like fsck and mount to quickly\\\
-       and easily find block devices by filesystem UUID and LABEL.
-  URL:=http://e2fsprogs.sourceforge.net/
+endef
+
+define Package/libblkid/description
+ The blkid library which allows system programs like fsck and mount to 
+ quickly and easily find block devices by filesystem UUID and LABEL.

 endef
 
 define Package/tune2fs
 endef
 
 define Package/tune2fs

-  $(call Package/e2fsprogs)
+$(call Package/e2fsprogs)

   TITLE:=Ext2 Filesystem tune utility
   TITLE:=Ext2 Filesystem tune utility

-  DESCRIPTION:=Ext2 Filesystem tune utility

   DEPENDS:=e2fsprogs
 endef
 
 define Package/resize2fs
   DEPENDS:=e2fsprogs
 endef
 
 define Package/resize2fs

-  $(call Package/e2fsprogs)
+$(call Package/e2fsprogs)

   TITLE:=Ext2 Filesystem resize utility
   TITLE:=Ext2 Filesystem resize utility

-  DESCRIPTION:=Ext2 Filesystem resize utility

   DEPENDS:=e2fsprogs
 endef
 
   DEPENDS:=e2fsprogs
 endef
 


@@ -90,10 +99,8 @@ endef
 define Build/InstallDev
        $(MAKE) -C $(PKG_BUILD_DIR) \
                BUILDCC="$(HOSTCC)" \
 define Build/InstallDev
        $(MAKE) -C $(PKG_BUILD_DIR) \
                BUILDCC="$(HOSTCC)" \

-               DESTDIR="$(STAGING_DIR)" \
+               DESTDIR="$(1)" \

                install-libs
                install-libs

-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc

 endef
 
 define Build/UninstallDev
 endef
 
 define Build/UninstallDev


@@ -119,7 +126,7 @@ define Package/libuuid/install
 endef
 
 define Package/libblkid/install
 endef
 
 define Package/libblkid/install

-       $(INSTALL_DIR) $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so.* $(1)/usr/lib/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so.* $(1)/usr/lib/
 endef