[packages] massive change: replace occurences of -I$(STAGING_DIR)/{include,usr/includ...

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

diff --git a/net/iodine/Makefile b/net/iodine/Makefile
index 74b7f66032ee759c8767d8c4d74270e162086297..b324f9b99e8f7add14619ebba5bbf9df14e7ecdb 100644 (file)
--- a/net/iodine/Makefile
+++ b/net/iodine/Makefile
@@ -1,47 +1,46 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 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:=iodine
-PKG_VERSION:=0.3.4
+PKG_VERSION:=0.5.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://code.kryo.se/iodine/
-PKG_MD5SUM:=dfbc5037fe0229e15f6f15775117aef5
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=af2d9062b7788fc47385d8c6c645dfa0
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iodine/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+zlib
+  DEPENDS:=+zlib +kmod-tun
   TITLE:=IP over DNS tunneling
   URL:=http://code.kryo.se/iodine/
-  DESCRIPTION:=\
-       iodine
 endef
 
 define Package/iodine
   $(call Package/iodine/Default)
   TITLE+= client version
-  DESCRIPTION+= client version
+endef
+
+define Package/iodine/description
+ iodine client version
 endef
 
 define Package/iodined
   $(call Package/iodine/Default)
   TITLE+= server version
-  DESCRIPTION+= server version
+endef
+
+define Package/iodined/description
+ iodine server version
 endef
 
 define Build/Configure
@@ -49,21 +48,24 @@ endef
 
 define Build/Compile
        $(call Build/Compile/Default,\
-               OS=Linux \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -c -DLinux" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -lz" \
-               iodine iodined \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -c -DLINUX" \
+               LDFLAGS="$(TARGET_LDFLAGS) -lz" \
+               all \
        )
 endef
 
 define Package/iodine/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/iodine $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/iodine $(1)/usr/sbin
 endef
 
 define Package/iodined/install
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/iodined.init $(1)/etc/init.d/iodined
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/iodined.config $(1)/etc/config/iodined
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/iodined $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/iodined $(1)/usr/sbin
 endef
 
 $(eval $(call BuildPackage,iodine))