X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fopenvpn%2FMakefile;h=6172d7953d0b38dcf3657a21f8fde634bcbbea30;hb=9dd4c32e003d3df0804324c468102ab6f6c856f1;hp=8b36a35ed28c4d5ef5a4305a8dfe9a51308e00af;hpb=d5313e2c3ebe0fa1aaad9c288c7580f615e4d822;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 8b36a35ed2..6172d7953d 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,20 +1,21 @@
 #
-# 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:=openvpn
-PKG_VERSION:=2.0.9
-PKG_RELEASE:=5
+PKG_VERSION:=2.1.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
-PKG_MD5SUM:=60745008b90b7dbe25fe8337c550fec6
+PKG_MD5SUM:=b273ed2b5ec8616fb9834cde8634bce7
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -60,22 +61,17 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Package/openvpn/install	
+define Package/openvpn/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/init.d/
 	$(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
+	$(INSTALL_DIR) $(1)/etc/openvpn
 endef
 
-define Package/openvpn-easy-rsa/install	
+define Package/openvpn-easy-rsa/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/easy-rsa