pwrtray: Major bugfixes

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

diff --git a/lang/luasocket/Makefile b/lang/luasocket/Makefile
index ce83fb68d640db2b193a567e38d76b67e5cd6664..6dc88cd4d03ce918fc76204e3e0c8c291ddb9b3b 100644 (file)
--- a/lang/luasocket/Makefile
+++ b/lang/luasocket/Makefile
@@ -1,16 +1,15 @@
-# 
+#
 # Copyright (C) 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:=luasocket
 PKG_VERSION:=2.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2664
@@ -19,12 +18,12 @@ PKG_MD5SUM:=41445b138deb7bcfe97bff957503da8e
 include $(INCLUDE_DIR)/package.mk
 
 define Package/luasocket
-  SUBMENU:=LUA
+  SUBMENU:=Lua
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=LUASocket
+  TITLE:=LuaSocket
   URL:=http://luasocket.luaforge.net/
-  DEPENDS:=lua
+  DEPENDS:=+lua
 endef
 
 define Package/luasocket/description
@@ -37,17 +36,24 @@ define Build/Configure
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ all \
-       LIBDIR="-L$(STAGING_DIR)/usr/lib/" \
-       CC="$(TARGET_CC) $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-       LD="$(TARGET_CROSS)ld -shared" 
+       $(MAKE) -C $(PKG_BUILD_DIR)/ \
+               LIBDIR="$(TARGET_LDFLAGS)" \
+               CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \
+               LD="$(TARGET_CROSS)ld -shared" \
+               all
 endef
 
 
 define Package/luasocket/install
        $(INSTALL_DIR) $(1)/usr/lib/lua
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/mime.{so.1.0.2,lua} $(1)/usr/lib/lua
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/socket.{so.2.0.2,lua} $(1)/usr/lib/lua
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ltn12,mime,socket}.lua $(1)/usr/lib/lua
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mime.so.1.0.2 $(1)/usr/lib/lua
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket.so.2.0.2 $(1)/usr/lib/lua
+       $(INSTALL_DIR) $(1)/usr/lib/lua/mime
+       ln -sf ../mime.so.1.0.2 $(1)/usr/lib/lua/mime/core.so
+       $(INSTALL_DIR) $(1)/usr/lib/lua/socket
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ftp,http,smtp,tp,url}.lua $(1)/usr/lib/lua/socket
+       ln -sf ../socket.so.2.0.2 $(1)/usr/lib/lua/socket/core.so
 endef
 
 $(eval $(call BuildPackage,luasocket))