oops... wrong patch (unfixed typo)

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 5171b28..792f5e6 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -16,10 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=3f4f5d07d12dedc0a3fd23472171fe94
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=3f4f5d07d12dedc0a3fd23472171fe94

-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -45,13 +41,14 @@ endef
 define KernelPackage/fuse
   SUBMENU:=Filesystems
   $(call Package/fuse/Default)
 define KernelPackage/fuse
   SUBMENU:=Filesystems
   $(call Package/fuse/Default)

-  TITLE+= (kernel module)

   DEPENDS:=@LINUX_2_6
   DEPENDS:=@LINUX_2_6

+  TITLE+= (kernel module)

   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE kernel module.
   DESCRIPTION+=\\\
        \\\
        This package contains the FUSE kernel module.

-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)

   FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
   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 Package/libfuse
 endef
 
 define Package/libfuse


@@ -65,6 +62,21 @@ define Package/libfuse
        This package contains the FUSE shared library, needed by other programs.
 endef
 
        This package contains the FUSE shared library, needed by other programs.
 endef
 

+CONFIGURE_VARS += \
+        kernsrcver="$(LINUX_VERSION)"
+
+CONFIGURE_ARGS += \
+       --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 Build/Configure
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
                touch configure.in ; \
 define Build/Configure
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
                touch configure.in ; \


@@ -72,39 +84,8 @@ define Build/Configure
                touch Makefile.in ; \
                touch include/config.h.in ; \
                touch configure ; \
                touch Makefile.in ; \
                touch include/config.h.in ; \
                touch configure ; \

-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               ./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 \
-       );
+       )
+       $(call Build/Configure/Default)

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile


@@ -112,6 +93,8 @@ define Build/Compile
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

+               AM_CFLAGS="$(TARGET_CFLAGS) -DDISABLE_COMPAT=1" \
+               EXTRA_DIST="" \

                all install
 endef
 
                all install
 endef