diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-07-03 07:19:41 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-07-03 07:21:52 +0200 |
| commit | 47a984477b1d300047b3001971f0af0e371ea9ee (patch) | |
| tree | 6a3c02b8b0b560d6dec66a03fa1d237ac085f51d /package/utils | |
| parent | 7c23f741e97f6645bb5cd662a4943796a344b26a (diff) | |
| download | upstream-47a984477b1d300047b3001971f0af0e371ea9ee.tar.gz upstream-47a984477b1d300047b3001971f0af0e371ea9ee.tar.bz2 upstream-47a984477b1d300047b3001971f0af0e371ea9ee.zip | |
lua5.3: stage Lua headers in proper location
Fix wrong paths in InstallDev which cause Lua 5.3 headers to be staged
in /usr/include/, overwriting Lua 5.1 headers and leading to widespread
build failures in all Lua related packages.
Fixes: FS#2348
Fixes: 6b161bb8d5 ("lua5.3: package Lua 5.3 version")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/utils')
| -rw-r--r-- | package/utils/lua5.3/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/package/utils/lua5.3/Makefile b/package/utils/lua5.3/Makefile index 61d1d1b486..de178b55ff 100644 --- a/package/utils/lua5.3/Makefile +++ b/package/utils/lua5.3/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua PKG_VERSION:=5.3.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ @@ -105,9 +105,10 @@ define Host/Install endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/lua5.3/lua{,lib,conf}.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/lua5.3/lauxlib.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/include/lua5.3 $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/include/lua5.3/lua{,lib,conf}.h $(1)/usr/include/lua5.3/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/lua5.3/lauxlib.h $(1)/usr/include/lua5.3/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua5.3.a $(1)/usr/lib/ endef define Package/lua5.3/install |