diff options
| author | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2021-08-11 11:17:30 -0300 |
|---|---|---|
| committer | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2021-08-11 17:47:30 -0300 |
| commit | 82032d4fb4ef1d79cdedbd3f2c88549b85cfbaf6 (patch) | |
| tree | b1bf4f43876dd418680f604ca61cca580a8cb124 /lang/lua-rs232 | |
| parent | 0e4e08ff24916a460b017323fa7a56f8677407ae (diff) | |
lua-rs232: don't rely on detected luadir
If TOPDIR starts with /usr, then the configure script will use the
staging tree hierarchy instead of using plain /usr/lib. For example, if
TOPDIR=/usr/src/openwrt, then the files will not be available under
$(PKG_INSTALL_DIR)/usr/lib/lua/5.1/, as expected, but under
$(PKG_INSTALL_DIR)/usr/src/openwrt/staging_dir/hostpkg/lib/lua/5.1/.
Set the correct path when calling 'make'. As a bonus, the hardcoded
version number in the Makefile can be dropped.
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Diffstat (limited to 'lang/lua-rs232')
| -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)) |