diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-10-01 14:35:49 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-10-01 15:07:36 +0200 |
| commit | 19ebf34cc163944f1fb1b5b22fc5f5d104790cc8 (patch) | |
| tree | f13d8732ed04760610d9c6dadc99e701556f1730 | |
| parent | 667cb27fe9ae1c5aa4e4509e4046c1b53450cfb8 (diff) | |
| download | ptxdist-19ebf34cc163944f1fb1b5b22fc5f5d104790cc8.tar.gz ptxdist-19ebf34cc163944f1fb1b5b22fc5f5d104790cc8.tar.xz | |
luaexpat: cleanup and version fixes
Make sure the correct lua version is used and define the correct
environment variables. Add license information.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/luaexpat.make | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/rules/luaexpat.make b/rules/luaexpat.make index 52ef45a66..1389d1f4c 100644 --- a/rules/luaexpat.make +++ b/rules/luaexpat.make @@ -23,7 +23,8 @@ LUAEXPAT_SUFFIX := tar.gz LUAEXPAT_URL := http://matthewwild.co.uk/projects/luaexpat/$(LUAEXPAT).$(LUAEXPAT_SUFFIX) LUAEXPAT_SOURCE := $(SRCDIR)/$(LUAEXPAT).$(LUAEXPAT_SUFFIX) LUAEXPAT_DIR := $(BUILDDIR)/$(LUAEXPAT) -LUAEXPAT_LICENSE := unknown +LUAEXPAT_LICENSE := MIT +LUAEXPAT_LICENSE_FILES := file://doc/us/license.html;md5=9e100888b4a39ac08c37fb127fefc458 # ---------------------------------------------------------------------------- # Prepare @@ -31,17 +32,12 @@ LUAEXPAT_LICENSE := unknown LUAEXPAT_CONF_TOOL := NO -LUAEXPAT_MAKE_OPT := \ - $(CROSS_ENV_CC) \ - LUA_VERSION_NUM=501 \ - LUA_INC="-I." \ - EXPAT_INC="-I." - -LUAEXPAT_INSTALL_OPT := \ - $(LUAEXPAT_MAKE_OPT) \ - LUA_LIBDIR=$(LUAEXPAT_PKGDIR)/usr/lib/lua/5.1 \ - LUA_DIR=$(LUAEXPAT_PKGDIR)/usr/share/lua/5.1 \ - install +LUAEXPAT_LUA_VERSION = $(basename $(LUA_VERSION)) +LUAEXPAT_MAKE_ENV = \ + $(CROSS_ENV) \ + LUA_V=$(LUAEXPAT_LUA_VERSION) \ + LUA_INC= \ + EXPAT_INC= # ---------------------------------------------------------------------------- # Target-Install @@ -56,8 +52,10 @@ $(STATEDIR)/luaexpat.targetinstall: @$(call install_fixup, luaexpat,AUTHOR,"Joerg Platte <joerg.platte@googlemail.com>") @$(call install_fixup, luaexpat,DESCRIPTION,missing) - @$(call install_copy, luaexpat, 0, 0, 0644, -, /usr/share/lua/5.1/lxp/lom.lua) - @$(call install_lib, luaexpat, 0, 0, 0644, lua/5.1/lxp) + @$(call install_copy, luaexpat, 0, 0, 0644, -, \ + /usr/share/lua/$(LUAEXPAT_LUA_VERSION)/lxp/lom.lua) + @$(call install_lib, luaexpat, 0, 0, 0644, \ + lua/$(LUAEXPAT_LUA_VERSION)/lxp) @$(call install_finish, luaexpat) @$(call touch) |