[packages] sshfs: remove libintl hacks from makefile

[openwrt/svn-archive/archive.git] / net / sshfs / Makefile

diff --git a/net/sshfs/Makefile b/net/sshfs/Makefile
index 7db7a932b8fab108d50b2b67cfb03ade39eb60cd..bbd6d8f9333a43e422a559508675bd71c0af1595 100644 (file)
--- a/net/sshfs/Makefile
+++ b/net/sshfs/Makefile
@@ -4,47 +4,44 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sshfs
-PKG_VERSION:=1.7
+PKG_VERSION:=2.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-fuse-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/fuse
-PKG_MD5SUM:=e91a2fed1da952a375798408dc6e41a0
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-fuse-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=26e9206eb5169e87e6f95f54bc005a4f
 
-PKG_BUILD_DEPENDS:=libfuse glib2
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-fuse-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/sshfs
   TITLE:=SSHFS
-  DEPENDS:=+libfuse +fuse-utils +glib2
+  DEPENDS:=+libfuse +fuse-utils +glib2 +libpthread
   SECTION:=net
   CATEGORY:=Network
-  DESCRIPTION:=\
-       Mount remote system over sftp.
+  SUBMENU:=Filesystem
   URL:=http://fuse.sourceforge.net/
 endef
 
+define Package/sshfs/description
+       Mount remote system over sftp.
+endef
+
 CONFIGURE_VARS += \
        SSHFS_CFLAGS=" \
                -D_FILE_OFFSET_BITS=64 \
-               -I$(STAGING_DIR)/usr/lib/libintl/include \
-               -I$(STAGING_DIR)/usr/lib/libiconv/include \
                -I$(STAGING_DIR)/usr/include/glib-2.0 \
-               -I$(STAGING_DIR)/usr/include/glib-2.0/glib \
-               -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
+               -I$(STAGING_DIR)/usr/lib/glib-2.0/include \
+               -I$(STAGING_DIR)/usr/include/fuse" \
        SSHFS_LIBS=" \
-               -lglib-2.0 -lintl -liconv -lfuse -pthread \
-               -L$(STAGING_DIR)/usr/lib/libintl/lib \
-               -L$(STAGING_DIR)/usr/lib/libiconv/lib"
-               
+               -lglib-2.0 -liconv -lfuse -pthread -lgthread-2.0 \
+               -L$(STAGING_DIR)/usr/lib"
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                ARCH="$(LINUX_KARCH)" \