diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-08-18 02:05:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 02:05:23 -0700 |
| commit | 1cba8af1b1eb4b499488534164cd3d41b33026ea (patch) | |
| tree | 682b387650f0edc43b18fbb9a2255e13b91e69b6 | |
| parent | 1062324202df123aeca0783bb0d34f7f8500d8f3 (diff) | |
| parent | 82032d4fb4ef1d79cdedbd3f2c88549b85cfbaf6 (diff) | |
Merge pull request #16327 from cotequeiroz/lua-rs232
lua-rs232: don't rely on detected luadir
| -rw-r--r-- | lang/lua-rs232/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lang/lua-rs232/Makefile b/lang/lua-rs232/Makefile index d5fb95331..a7b2d9505 100644 --- a/lang/lua-rs232/Makefile +++ b/lang/lua-rs232/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-rs232 PKG_SOURCE_DATE:=2019-11-20 PKG_SOURCE_VERSION:=c106c94d1a5a84e8582c936528303528608776c2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/srdgame/librs232 @@ -42,6 +42,7 @@ endef TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed +MAKE_FLAGS += luadir='$$$${prefix}/lib/lua' luaexecdir='$$$${exec_prefix}/lib/lua' define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/librs232 @@ -49,7 +50,7 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/librs232* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/lua - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/5.1/luars232* $(1)/usr/lib/lua + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/luars232* $(1)/usr/lib/lua $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/librs232.pc $(1)/usr/lib/pkgconfig endef @@ -58,7 +59,7 @@ define Package/lua-rs232/install $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librs232.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/lua - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/5.1/luars232* $(1)/usr/lib/lua + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/luars232* $(1)/usr/lib/lua endef $(eval $(call BuildPackage,lua-rs232)) |