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

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

diff --git a/lang/luasocket/Makefile b/lang/luasocket/Makefile
index bf9c9e600929babe5578831f177f01e7bb9be6ed..d2673c2458f3590b3bd6b6a898341b25e097afcf 100644 (file)
--- a/lang/luasocket/Makefile
+++ b/lang/luasocket/Makefile
@@ -4,27 +4,26 @@
 # 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:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2664/
+PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2664
 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
@@ -38,8 +37,8 @@ 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" \
+       LIBDIR="$(TARGET_LDFLAGS)" \
+       CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
        LD="$(TARGET_CROSS)ld -shared" 
 endef
 
@@ -48,6 +47,10 @@ 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_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
+       ln -sf ../socket.so.2.0.2 $(1)/usr/lib/lua/socket/core.so
 endef
 
 $(eval $(call BuildPackage,luasocket))