From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 4 Oct 2016 23:42:51 +0000 (+0200)
Subject: Revert "luci-base: use default install paths for host utils"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d4c33720208346ee7983213fe764df3102b8a771;p=project%2Fluci.git

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 84d151230c..eb034d2081 100644
--- 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 972a451c69..f0763cb1df 100644
--- 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))