clean up the gnu make package makefile, fix avr32 compile

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

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 270e56cbdd4b525276d6b4ab199681938cf66720..5abd1169919bec93afab1d86af746c29f13a7ec2 100644 (file)
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -9,15 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vtun
-PKG_VERSION:=2.6
+PKG_VERSION:=3.0.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=309534fd03c5d13a19c43916f61f4bbf
 
-PKG_SOURCE_URL:=@SF/vtun
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_SOURCE_URL:=@SF/vtun
+PKG_MD5SUM:=c342ffe77055d4248a38f0b380f28c1b
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,8 +23,8 @@ define Package/vtun
   CATEGORY:=Network
   DEPENDS:=+kmod-tun +liblzo +libopenssl +zlib
   TITLE:=VPN tunneling daemon
-  DESCRIPTION:=VPN tunneling daemon
   URL:=http://vtun.sourceforge.net
+  SUBMENU:=VPN
 endef
 
 define Package/vtun/conffiles
@@ -35,21 +32,27 @@ define Package/vtun/conffiles
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,,LIBS="-L$(STAGING_DIR)/usr/lib" \
+       $(call Build/Configure/Default, \
+               --with-lzo-headers="$(STAGING_DIR)/usr/include/lzo" \
+               --with-lzo-lib="$(STAGING_DIR)/usr/lib/" \
+               --with-ssl-headers="$(STAGING_DIR)/usr/include/openssl" \
+               , \
+               LIBS="-L$(STAGING_DIR)/usr/lib" \
                BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
-               LZO_HDR_DIR="$(STAGING_DIR)/usr/include" \
-               SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl")
+               LZO_HDR_DIR="$(STAGING_DIR)/usr/include/lzo" \
+               SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
+       )
 endef
 
 define Build/Compile   
-$(call Build/Compile/Default,vtund)
+       $(call Build/Compile/Default,vtund)
 endef
 
 define Package/vtun/install    
-       install -m0755 -d $(1)/etc
-       install -m0600 $(PKG_BUILD_DIR)/vtund.conf $(1)/etc/
-       install -m0755 -d $(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/vtund $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/vtund.conf $(1)/etc/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/vtund $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,vtun))