[cosmetic] accommodate for 5 digits svn revisions :)

[openwrt.git] / package / lua / Makefile

diff --git a/package/lua/Makefile b/package/lua/Makefile
index 0c2e8e2..b418b30 100644 (file)
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -1,16 +1,15 @@
 # 
 # 

-# Copyright (C) 2006-2008 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.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lua
 PKG_VERSION:=5.1.4
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lua
 PKG_VERSION:=5.1.4

-PKG_RELEASE:=3
+PKG_RELEASE:=5

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.lua.org/ftp/ \


@@ -19,14 +18,13 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
        http://www.tecgraf.puc-rio.br/lua/ftp/
 PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150
 
        http://www.tecgraf.puc-rio.br/lua/ftp/
 PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150
 

-include $(INCLUDE_DIR)/host-build.mk

 include $(INCLUDE_DIR)/package.mk
 
 define Package/lua/Default
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lua/Default

-  SUBMENU:=LUA
+  SUBMENU:=Lua

   SECTION:=lang
   CATEGORY:=Languages
   SECTION:=lang
   CATEGORY:=Languages

-  TITLE:=LUA programming language
+  TITLE:=Lua programming language

   URL:=http://www.lua.org/
 endef
 
   URL:=http://www.lua.org/
 endef
 


@@ -46,7 +44,7 @@ endef
 
 define Package/liblua/description
 $(call Package/lua/Default/description)
 
 define Package/liblua/description
 $(call Package/lua/Default/description)

- This package contains the LUA shared libraries, needed by other programs.
+ This package contains the Lua shared libraries, needed by other programs.

 endef
 
 define Package/lua
 endef
 
 define Package/lua


@@ -57,7 +55,7 @@ endef
 
 define Package/lua/description
 $(call Package/lua/Default/description)
 
 define Package/lua/description
 $(call Package/lua/Default/description)

- This package contains the LUA language interpreter.
+ This package contains the Lua language interpreter.

 endef
 
 define Package/luac
 endef
 
 define Package/luac


@@ -68,7 +66,7 @@ endef
 
 define Package/luac/description
 $(call Package/lua/Default/description)
 
 define Package/luac/description
 $(call Package/lua/Default/description)

- This package contains the LUA language compiler.
+ This package contains the Lua language compiler.

 endef
 
 define Package/lua-examples
 endef
 
 define Package/lua-examples


@@ -79,24 +77,12 @@ endef
 
 define Package/lua-examples/description
 $(call Package/lua/Default/description)
 
 define Package/lua-examples/description
 $(call Package/lua/Default/description)

- This package contains LUA language examples.
+ This package contains Lua language examples.

 endef
 
 endef
 

-# Host build
-define Host/Configure
-
-endef
-
-define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR)/src luac-host
-endef
-
-define Host/Install
-       $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/luac-host $(STAGING_DIR_HOST)/bin/luac
+define Build/Configure

 endef
 
 endef
 

-# Target build
-

 TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC)
 
 ifneq ($(CONFIG_USE_EGLIBC),)
 TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC)
 
 ifneq ($(CONFIG_USE_EGLIBC),)


@@ -105,8 +91,6 @@ ifneq ($(CONFIG_USE_EGLIBC),)
   endif
 endif
 
   endif
 endif
 

-Build/Configure=$(Host/Configure)
-

 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CROSS)gcc" \
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CROSS)gcc" \


@@ -125,13 +109,15 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include

        $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib,conf}.h $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/lnum_config.h $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib,conf}.h $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/lnum_config.h $(1)/usr/include/

-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so*} $(1)/usr/lib/
        ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblualib.so
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so*} $(1)/usr/lib/
        ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblualib.so

+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_BUILD_DIR)/etc/lua.pc $(1)/usr/lib/pkgconfig/

 endef
 
 define Package/liblua/install
 endef
 
 define Package/liblua/install


@@ -155,7 +141,6 @@ define Package/lua-examples/install
                $(1)/usr/share/lua/examples/
 endef
 
                $(1)/usr/share/lua/examples/
 endef
 

-$(eval $(call HostBuild))

 $(eval $(call BuildPackage,liblua))
 $(eval $(call BuildPackage,lua))
 $(eval $(call BuildPackage,luac))
 $(eval $(call BuildPackage,liblua))
 $(eval $(call BuildPackage,lua))
 $(eval $(call BuildPackage,luac))