remove UninstallDev

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

diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index d360fc931bb96737845f2a346d8bdc2c5ec326e6..1c2d2305f3c6a88cebd8404f881478457916146d 100644 (file)
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lua
-PKG_VERSION:=5.1.1
+PKG_VERSION:=5.1.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -17,8 +17,7 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
        http://ftp.gwdg.de/pub/languages/lua/ \
        http://mirrors.dotsrc.org/lua/ \
        http://www.tecgraf.puc-rio.br/lua/ftp/
-PKG_MD5SUM:=22f4f912f20802c11006fe9b84d5c461
-PKG_CAT:=zcat
+PKG_MD5SUM:=687ce4c2a1ddff18f1008490fdc4e5e0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -26,51 +25,65 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lua/Default
+  SUBMENU:=LUA
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=LUA programming language
-  DESCRIPTION:=\
-       Lua is a powerful light-weight programming language designed for extending \\\
-       applications. Lua is also frequently used as a general-purpose, stand-alone \\\
-       language. Lua is free software.
   URL:=http://www.lua.org/
 endef
 
 define Package/liblua
   $(call Package/lua/Default)
+  SUBMENU:=
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= (libraries)
-  DESCRIPTION+=\\\
-       \\\
-       This package contains the LUA shared libraries, needed by other programs.
+endef
+
+define Package/liblua/description
+=
+       Lua is a powerful light-weight programming language designed for extending 
+       applications. Lua is also frequently used as a general-purpose, stand-alone 
+       language. Lua is free software. This package contains the LUA shared libraries, needed by other programs.
 endef
 
 define Package/lua
   $(call Package/lua/Default)
   DEPENDS:=+liblua +libreadline +libncurses
   TITLE+= (interpreter)
-  DESCRIPTION+=\\\
-       \\\
-       This package contains the LUA language interpreter.
+endef
+
+define Package/lua/description
+=
+       Lua is a powerful light-weight programming language designed for extending 
+       applications. Lua is also frequently used as a general-purpose, stand-alone 
+       language. Lua is free software. This package contains the LUA language interpreter.
 endef
 
 define Package/luac
   $(call Package/lua/Default)
   DEPENDS:=+liblua
   TITLE+= (compiler)
-  DESCRIPTION+=\\\
-       \\\
-       This package contains the LUA language compiler.
+endef
+
+define Package/luac/description
+=
+       Lua is a powerful light-weight programming language designed for extending 
+       applications. Lua is also frequently used as a general-purpose, stand-alone 
+       language. Lua is free software. This package contains the LUA language compiler.
 endef
 
 define Package/lua-examples
   $(call Package/lua/Default)
   DEPENDS:=lua
   TITLE+= (examples)
-  DESCRIPTION+=\\\
-       \\\
-       This package contains LUA language examples.
+endef
+
+define Package/lua-examples/description
+=
+       Lua is a powerful light-weight programming language designed for extending 
+       applications. Lua is also frequently used as a general-purpose, stand-alone 
+       language. Lua is free software. This package contains LUA language examples.
 endef
 
 define Build/Configure
@@ -83,8 +96,8 @@ define Build/Compile
                AR="$(TARGET_CROSS)ar rcu" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                INSTALL_ROOT=/usr \
-               MYCFLAGS="-I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
-               MYLDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               MYCFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+               MYLDFLAGS="$(TARGET_LDFLAGS)" \
                PKG_VERSION=$(PKG_VERSION) \
                all linux 
        rm -rf $(PKG_INSTALL_DIR)
@@ -95,20 +108,13 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib,conf}.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so.*} $(STAGING_DIR)/usr/lib/
-       ln -sf liblua.so.$(PKG_VERSION) $(STAGING_DIR)/usr/lib/liblua.so
-       ln -sf liblua.so.$(PKG_VERSION) $(STAGING_DIR)/usr/lib/liblualib.so
-endef
-
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/lua{,lib,conf}.h \
-               $(STAGING_DIR)/usr/include/lauxlib.h \
-               $(STAGING_DIR)/usr/lib/liblua.{a,so*}
+       mkdir -p $(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/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so.*} $(1)/usr/lib/
+       ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblua.so
+       ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblualib.so
 endef
 
 define Package/liblua/install
@@ -118,12 +124,12 @@ endef
 
 define Package/lua/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/
 endef
 
 define Package/luac/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/
 endef
 
 define Package/lua-examples/install