[patch-team] n2n update to release 3875 - Signed-off-by: hanno.schupp@gmail.com

[packages.git] / net / n2n / Makefile

diff --git a/net/n2n/Makefile b/net/n2n/Makefile
index a1172b9..338ccb6 100644 (file)
--- a/net/n2n/Makefile
+++ b/net/n2n/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_BRANCH:=trunk
 PKG_SOURCE_URL:=https://svn.ntop.org/svn/ntop/trunk/n2n
-PKG_REV:=3561
+PKG_REV:=3875
 
 PKG_NAME:=n2n
 PKG_VERSION:=$(PKG_REV)
@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/n2n
@@ -36,14 +33,15 @@ endef
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
-       $(TARGET_CONFIGURE_OPTS) \
-       CFLAGS="$(TARGET_CFLAGS)"
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               INSTALL_PROG=":"
 endef
 
 define Package/n2n/install
        $(INSTALL_DIR) $(1)/sbin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/edge $(1)/sbin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/supernode $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/edge $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/supernode $(1)/sbin/
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_DATA) ./files/n2n.config $(1)/etc/config/n2n
        $(INSTALL_DIR) $(1)/etc/init.d