Retain symlinks. $(INSTALL_*) copys the contens of a file, so if we want to keep

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

diff --git a/net/nfs-utils/Makefile b/net/nfs-utils/Makefile
index a39583df9955f6736cc631f76e3f30dcca3c513d..c915fb3bac704691cd7049f41eb9ba70fcf1eb7a 100644 (file)
--- a/net/nfs-utils/Makefile
+++ b/net/nfs-utils/Makefile
@@ -1,5 +1,5 @@
-# 
-# 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.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfs-utils
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfs-utils

-PKG_VERSION:=1.1.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.1.2
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.sourceforge.net/nfs/
 
 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
 
 
 PKG_BUILD_DEPENDS:=libgssapi librpcsecgss libnfsidmap libwrap
 


@@ -38,6 +38,8 @@ endef
 
 CONFIGURE_ARGS += --disable-gss
 TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
 
 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)" \
 define Build/Compile
        $(call Build/Compile/Default, \
                OPT="$(TARGET_CFLAGS)" \


@@ -47,17 +49,10 @@ define Build/Compile
        )
 endef
 
        )
 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
 define Package/nfs-utils/install

-        $(call Package/Template,sbin/mount*,$(1)/sbin)
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.nfs $(1)/sbin/
+       (cd $(1)/sbin; ln -s mount.nfs mount.nfs4; ln mount.nfs umount.nfs; ln -s mount.nfs umount.nfs4)

 endef
 
 $(eval $(call BuildPackage,nfs-utils))
 endef
 
 $(eval $(call BuildPackage,nfs-utils))