xkbdata: Add missing dependency to xkbcomp

[openwrt/svn-archive/archive.git] / lang / luasec / Makefile

diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile
index e7dbef7b9457c81cd3d4ea1214cad82762fc7103..50d7741734a9eb3f5d6a3a26f7b281183974076b 100644 (file)
--- a/lang/luasec/Makefile
+++ b/lang/luasec/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2009 OpenWrt.org
+#
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luasec
-PKG_VERSION:=0.3
+PKG_VERSION:=0.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/3920
-PKG_MD5SUM:=a88f2c05d22abfcc9ab92bd1d6f32b37
+PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/4255
+PKG_MD5SUM:=712158d60207bdbb6215fc7e07d8db24
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -21,7 +23,7 @@ define Package/luasec
   SUBMENU:=Lua
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=LuaSec 
+  TITLE:=LuaSec
   URL:=http://luasec.luaforge.net/
   DEPENDS:=+lua +libopenssl +luasocket
 endef
@@ -33,18 +35,23 @@ endef
 define Build/Configure
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/src linux \
-               INCDIR="$(TARGET_CPPFLAGS)" \
-               LIBDIR="$(TARGET_LDFLAGS)" \
-               CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
-               LD="$(TARGET_CROSS)ld -shared" 
-endef
+MAKE_PATH = ./src
 
+MAKE_FLAGS += \
+       INCDIR="$(TARGET_CPPFLAGS)" \
+       LIBDIR="$(TARGET_LDFLAGS)" \
+       CC="$(TARGET_CC) $(TARGET_CFLAGS) -std=gnu99" \
+       LD="$(TARGET_CROSS)ld -shared" \
+       LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
+       LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
+       linux \
 
 define Package/luasec/install
        $(INSTALL_DIR) $(1)/usr/lib/lua
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ssl.so,ssl.lua} $(1)/usr/lib/lua
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl.so $(1)/usr/lib/lua/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl.lua $(1)/usr/lib/lua/
+       $(INSTALL_DIR) $(1)/usr/lib/lua/ssl
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl/https.lua $(1)/usr/lib/lua/ssl/
 endef
 
 $(eval $(call BuildPackage,luasec))