fix nfs-utils compile

[openwrt/svn-archive/archive.git] / net / nfs-utils / Makefile

diff --git a/net/nfs-utils/Makefile b/net/nfs-utils/Makefile
index 85bd046d9a701c543170707e3c69f2b40da688c4..ad57cd5432844f13571d24ed0f8324d97dd5d568 100644 (file)
--- a/net/nfs-utils/Makefile
+++ b/net/nfs-utils/Makefile
@@ -1,20 +1,20 @@
-# 
-# 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: Makefile 6582 2007-03-16 20:21:39Z nbd $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfs-utils
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.1.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.sourceforge.net/nfs/
-PKG_MD5SUM:=df88c6fe88a26f9797e74cb2d3291a2a
+PKG_MD5SUM:=76ee9274c2b867839427eba91b327f03
 
 PKG_BUILD_DEPENDS:=libgssapi librpcsecgss libnfsidmap libwrap
 
@@ -30,11 +30,16 @@ define Package/nfs-utils
   $(call Package/nfs-utils/Default)
   DEPENDS:=+libwrap +libevent +libblkid
   TITLE:=updated mount utility (includes nfs4)
-  DESCRIPTION:=Updated mount.nfs command - allows mounting nfs4 volumes
+endef
+
+define Package/nfs-utils/description
+Updated mount.nfs command - allows mounting nfs4 volumes
 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)" \
@@ -44,17 +49,9 @@ define Build/Compile
        )
 endef
 
-define Package/Template
-       @if [ \! -f "$(PKG_INSTALL_DIR)/$(1)" ]; then \
-               -rm -f $(PKG_BUILD_DIR)/.built; \
-               $(MAKE) $(PKG_BUILD_DIR)/.built; \
-       fi
-       $(INSTALL_DIR) $(2)
-       $(CP) $(PKG_INSTALL_DIR)/$(1) $(2)/
-endef
-
 define Package/nfs-utils/install
-        $(call Package/Template,sbin/mount*,$(1)/sbin)
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount* $(1)/sbin/
 endef
 
 $(eval $(call BuildPackage,nfs-utils))