Revert "luci-base: use default install paths for host utils"

This reverts commit 87a7570690f7aeffb1aff01f320973c9acb668d3.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/luci.mk b/luci.mk
index 84d151230c7d8158eba88cd35af6a2581c85ca0f..eb034d208106e2dd72089583f4e14447dcd3db1a 100644 (file)
--- a/luci.mk
+++ b/luci.mk
@@ -150,7 +150,8 @@ LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci
 
 define SrcDiet
        $(FIND) $(1) -type f -name '*.lua' | while read src; do \
-               if LuaSrcDiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; \
+               if $(STAGING_DIR)/host/bin/lua $(STAGING_DIR)/host/bin/LuaSrcDiet \
+                       --noopt-binequiv -o "$$$$src.o" "$$$$src"; \
                then mv "$$$$src.o" "$$$$src"; fi; \
        done
 endef

diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index 972a451c696f6a15a4c2429edf2fac2b61778b6b..f0763cb1df51ff0f23eb821f4ab95aad5aec33d7 100644 (file)
--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@@ -37,9 +37,10 @@ define Host/Compile
 endef
 
 define Host/Install
-       $(INSTALL_DIR) $(1)/bin
-       $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo
-       $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(1)/bin/LuaSrcDiet
+       $(INSTALL_DIR) $(STAGING_DIR)/host/bin
+       $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+       $(INSTALL_BIN) src/po2lmo $(STAGING_DIR_HOST)/bin/po2lmo
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(STAGING_DIR)/host/bin/LuaSrcDiet
 endef
 
 $(eval $(call HostBuild))