X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fntfs-3g%2FMakefile;h=931aab47af05e60d202252b1e6f4e82c66fd1810;hb=c4b73fa154ce47702ee9b3bbe621d8f079eb7fa5;hp=314a52c0ff37b8893d6c90cf835a6fb246c12e72;hpb=a907c5ff7d4e08a397526fdb4f89a262bcbf42c9;p=openwrt.git

diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index 314a52c0ff..931aab47af 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -7,19 +7,14 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ntfs-3g
-PKG_VERSION:=0.20070207-RC1
-PKG_RELEASE:=1
+PKG_VERSION:=1.616
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.ntfs-3g.org/
-PKG_MD5SUM:=7c8c7a1338a0d36e315b665422e04c46
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=fdb1c55f00263c962a52d0707a6d075e
 
 PKG_BUILD_DEPENDS:=libfuse
 
@@ -30,57 +25,19 @@ define Package/ntfs-3g
   DEPENDS:=+libfuse +fuse-utils
   SECTION:=utils
   CATEGORY:=Utilities
-  DESCRIPTION:=\
-	Third generation Read/Write NTFS driver
   URL:=http://www.ntfs-3g.org
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		touch configure.in ; \
-		touch aclocal.m4 ; \
-		touch Makefile.in ; \
-		touch include/config.h.in ; \
-		touch configure ; \
-		$(TARGET_CONFIGURE_OPTS) \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--enable-kernel-module \
-			--enable-lib \
-			--enable-util \
-			--disable-example \
-			--disable-auto-modprobe \
-			--with-kernel="$(LINUX_DIR)" \
-			--disable-mtab \
-	);
+define Package/ntfs-3g/description
+ This package contains the third generation Read/Write NTFS driver
 endef
 
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	, \
+	ac_cv_path_LDCONFIG=""
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		ARCH="$(LINUX_KARCH)" \
@@ -109,3 +66,7 @@ define Package/ntfs-3g/install
 endef
 
 $(eval $(call BuildPackage,ntfs-3g))
+
+$(eval $(call RequireCommand,pkg-config, \
+	$(PKG_NAME) requires pkg-config. \
+))