Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 87a7570690.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2016-10-05 01:42:51 +02:00
parent dcb2a0e680
commit d4c3372020
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
luci.mk
View file

@ -150,7 +150,8 @@ LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci
define SrcDiet define SrcDiet
$(FIND) $(1) -type f -name '*.lua' | while read src; do \ $(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; \ then mv "$$$$src.o" "$$$$src"; fi; \
done done
endef endef

7
modules/luci-base/Makefile
View file

@ -37,9 +37,10 @@ define Host/Compile
endef endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(STAGING_DIR)/host/bin
$(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(1)/bin/LuaSrcDiet $(INSTALL_BIN) src/po2lmo $(STAGING_DIR_HOST)/bin/po2lmo
$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(STAGING_DIR)/host/bin/LuaSrcDiet
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))