X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fnfs-utils%2FMakefile;h=b55593b0f54da5820e36587ebf722432c6951e07;hp=7fd9e729f337c06c9846399089cd5b44a71d5d76;hb=31746dfb3bbcd2d9658d1f4fe234e6d09bbf4a12;hpb=13fb59dd0549e4f09ae3600298eda16396cb95f1

diff --git a/net/nfs-utils/Makefile b/net/nfs-utils/Makefile
index 7fd9e729f3..b55593b0f5 100644
--- a/net/nfs-utils/Makefile
+++ b/net/nfs-utils/Makefile
@@ -1,20 +1,19 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfs-utils
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.1.5
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/nfs/
-PKG_MD5SUM:=df88c6fe88a26f9797e74cb2d3291a2a
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/nfs
+PKG_MD5SUM:=2848072a5e53840b9bc520fbb6782b57
 
 PKG_BUILD_DEPENDS:=libgssapi librpcsecgss libnfsidmap libwrap
 
@@ -38,6 +37,8 @@ endef
 
 CONFIGURE_ARGS += --disable-gss
 TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
 define Build/Compile
 	$(call Build/Compile/Default, \
 		OPT="$(TARGET_CFLAGS)" \
@@ -49,7 +50,8 @@ endef
 
 define Package/nfs-utils/install
 	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount* $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.nfs $(1)/sbin/
+	(cd $(1)/sbin; ln -sf mount.nfs mount.nfs4; ln -sf mount.nfs umount.nfs; ln -sf mount.nfs umount.nfs4)
 endef
 
 $(eval $(call BuildPackage,nfs-utils))