diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-10-29 17:02:21 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-10-29 20:17:35 +0100 |
| commit | 1d88a47c1251a6606858d468b747da0515de3c66 (patch) | |
| tree | cc92e27abc1fb6aa655b5a8c92ef4adad37291a1 /rules/lua.make | |
| parent | 21fba4d1be592ac00e5cde3c3bdcde874fdfdcff (diff) | |
| download | ptxdist-1d88a47c1251a6606858d468b747da0515de3c66.tar.gz ptxdist-1d88a47c1251a6606858d468b747da0515de3c66.tar.xz | |
[lua] just cleanups
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules/lua.make')
| -rw-r--r-- | rules/lua.make | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/rules/lua.make b/rules/lua.make index 292a09e0b..a43bd4483 100644 --- a/rules/lua.make +++ b/rules/lua.make @@ -1,7 +1,7 @@ # -*-makefile-*- -# $Id: template-make 8509 2008-06-12 12:45:40Z mkl $ # # Copyright (C) 2008 by Erwin Rol +# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_LUA) += lua LUA_VERSION := 5.1.3 LUA := lua-$(LUA_VERSION) LUA_SUFFIX := tar.gz -LUA_URL := http://www.lua.org/ftp//$(LUA).$(LUA_SUFFIX) +LUA_URL := http://www.lua.org/ftp/$(LUA).$(LUA_SUFFIX) LUA_SOURCE := $(SRCDIR)/$(LUA).$(LUA_SUFFIX) LUA_DIR := $(BUILDDIR)/$(LUA) @@ -33,18 +33,6 @@ $(LUA_SOURCE): @$(call get, LUA) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/lua.extract: - @$(call targetinfo) - @$(call clean, $(LUA_DIR)) - @$(call extract, LUA) - @$(call patchin, LUA) - cd $(LUA_DIR) && chmod +x configure - @$(call touch) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -55,38 +43,13 @@ LUA_ENV := $(CROSS_ENV) # autoconf # LUA_AUTOCONF := $(CROSS_AUTOCONF_USR) + ifdef PTXCONF_LUA_READLINE LUA_AUTOCONF += --with-readline else LUA_AUTOCONF += --without-readline endif -$(STATEDIR)/lua.prepare: - @$(call targetinfo) - @$(call clean, $(LUA_DIR)/config.cache) - cd $(LUA_DIR) && \ - $(LUA_PATH) $(LUA_ENV) \ - ./configure $(LUA_AUTOCONF) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/lua.compile: - @$(call targetinfo) - cd $(LUA_DIR) && $(LUA_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/lua.install: - @$(call targetinfo) - @$(call install, LUA) - @$(call touch) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -99,7 +62,7 @@ $(STATEDIR)/lua.targetinstall: @$(call install_fixup, lua,PRIORITY,optional) @$(call install_fixup, lua,VERSION,$(LUA_VERSION)) @$(call install_fixup, lua,SECTION,base) - @$(call install_fixup, lua,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>") + @$(call install_fixup, lua,AUTHOR,"Erwin Rol <erwin@erwinrol.com>") @$(call install_fixup, lua,DEPENDS,) @$(call install_fixup, lua,DESCRIPTION,missing) @@ -110,10 +73,9 @@ ifdef PTXCONF_LUA_INSTALL_LUAC @$(call install_copy, lua, 0, 0, 0755, $(LUA_DIR)/src/luac, /usr/bin/luac) endif ifdef PTXCONF_LUA_INSTALL_LIBLUA - @$(call install_copy, lua, 0, 0, 0644, \ - $(LUA_DIR)/src/.libs/liblua-5.1.3.so, \ + @$(call install_copy, lua, 0, 0, 0644, -, \ /usr/lib/liblua-5.1.3.so) - @$(call install_link, lua, liblua-5.1.3.so, /usr/lib/liblua.so ) + @$(call install_link, lua, liblua-5.1.3.so, /usr/lib/liblua.so) endif @$(call install_finish, lua) |