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

Merge pull request #822 from NeoRaider/staging-dir-host

Browse source 
luci-base: use default install paths for host utils (again)
This commit is contained in:
Hannu Nyman 2016-10-10 19:06:33 +03:00 committed by GitHub
commit 3af8b3c5b6
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
luci.mk
View file

@ -150,8 +150,7 @@ 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 $(STAGING_DIR)/host/bin/lua $(STAGING_DIR)/host/bin/LuaSrcDiet \ if LuaSrcDiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; \
--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,10 +37,9 @@ define Host/Compile
endef endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR)/host/bin $(INSTALL_DIR) $(1)/bin
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo
$(INSTALL_BIN) src/po2lmo $(STAGING_DIR_HOST)/bin/po2lmo $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(1)/bin/LuaSrcDiet
$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(STAGING_DIR)/host/bin/LuaSrcDiet
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))