[packages] luafilesystem: rename ipk to luafilesystem, install shared libary into...

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

diff --git a/lang/luafilesystem/Makefile b/lang/luafilesystem/Makefile
index 945d263facf7cf4a866b84dd8c8e4627d2a3f328..97d207ee46dbbd02f541ac2932cdf3f64c716cb6 100644 (file)
--- a/lang/luafilesystem/Makefile
+++ b/lang/luafilesystem/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,26 +8,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luafilesystem
-PKG_VERSION:=1.4.1
-PKG_RELEASE:=1
+PKG_VERSION:=1.4.2
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/3345
-PKG_MD5SUM:=fe2fa6decc48f0267b4f09975750280e
+PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/3931
+PKG_MD5SUM:=8e7b2a9b899d669280456d0f95afd961
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/liblua-filesystem
-  SUBMENU:=LUA
+define Package/luafilesystem
+  SUBMENU:=Lua
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=luafilsystem - library for the LUA programming language
+  TITLE:=LuaFileSystem
   URL:=http://www.luaforge.net/projects/luafilesystem
   DEPENDS:=+liblua
 endef
 
 define Package/luafilesystem/description
- This package contains the luafilesystem library, a set of portable
+ This package contains the LuaFileSystem library, a set of portable
  functions for directory creation, listing and deletion and for file
  locking.
 endef
@@ -35,41 +35,29 @@ endef
 define Build/Configure
 endef
 
-TARGET_CFLAGS += $(FPIC) \
-       -I$(STAGING_DIR)/usr/include
+TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS)
 
 TARGET_LDFLAGS += -llua
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
+               CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
                LDFLAGS="$(TARGET_LDFLAGS)"
-       $(TARGET_CROSS)ar r $(PKG_BUILD_DIR)/src/liblua-filesystem.a $(PKG_BUILD_DIR)/src/lfs.o
+       $(TARGET_CROSS)ar r $(PKG_BUILD_DIR)/src/luafilesystem.a $(PKG_BUILD_DIR)/src/lfs.o
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       mkdir -p $(STAGING_DIR)/usr/lib/lua/5.1/
-       $(CP) $(PKG_BUILD_DIR)/src/lfs.h $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_BUILD_DIR)/src/lfs.so \
-               $(STAGING_DIR)/usr/lib/liblua-filesystem.so.0.0.0
-       cd $(STAGING_DIR)/usr/lib/ && \
-               ln -fs liblua-filesystem.so.0.0.0 liblua-filesystem.so
-       cd $(STAGING_DIR)/usr/lib/ && \
-               ln -fs liblua-filesystem.so.0.0.0 liblua-filesystem.so.0
-       cd $(STAGING_DIR)/usr/lib/lua/5.1/ && \
-               ln -fs ../../liblua-filesystem.so.0.0.0 lfs.so
-       $(CP) $(PKG_BUILD_DIR)/src/liblua-filesystem.a $(STAGING_DIR)/usr/lib
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/include
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/lua
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lfs.h $(STAGING_DIR)/usr/include
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(STAGING_DIR)/usr/lib/lua
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/luafilesystem.a $(STAGING_DIR)/usr/lib/lua
 endef
 
-define Package/liblua-filesystem/install
-       $(INSTALL_DIR) $(1)/usr/lib/lua/5.1
-       $(CP) $(PKG_BUILD_DIR)/src/lfs.so \
-               $(1)/usr/lib/liblua-filesystem.so.0.0.0
-       cd $(1)/usr/lib/ && ln -fs liblua-filesystem.so.0.0.0 liblua-filesystem.so
-       cd $(1)/usr/lib/lua/5.1/ && \
-               ln -fs ../../liblua-filesystem.so.0.0.0 lfs.so
+define Package/luafilesystem/install
+       $(INSTALL_DIR) $(1)/usr/lib/lua
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(1)/usr/lib/lua/lfs.so
 endef
 
-$(eval $(call BuildPackage,liblua-filesystem))
+$(eval $(call BuildPackage,luafilesystem))