diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-06-08 10:47:39 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-06-08 10:47:39 +0200 |
| commit | 1575d659a14c393a46cef8a2e917945b1c676726 (patch) | |
| tree | 2e15565db5e391ae7394d9db91e2d77db53c42af | |
| parent | 7c5006db68b1f12bbc9f5b5e1905669069a2375d (diff) | |
| parent | 4580faaa5e1e3988ea806deafb70071a58250473 (diff) | |
Merge pull request #735 from kdarbyshirebryant/srcdietfix
luci-base: fix lua interpreter location
| -rw-r--r-- | luci.mk | 2 | ||||
| -rw-r--r-- | modules/luci-base/Makefile | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -150,7 +150,7 @@ LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci define SrcDiet $(FIND) $(1) -type f -name '*.lua' | while read src; do \ - if $(STAGING_DIR_HOST)/bin/lua $(STAGING_DIR_HOST)/bin/LuaSrcDiet \ + if $(STAGING_DIR)/host/bin/lua $(STAGING_DIR)/host/bin/LuaSrcDiet \ --noopt-binequiv -o "$$$$src.o" "$$$$src"; \ then mv "$$$$src.o" "$$$$src"; fi; \ done diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile index a9c5e71cb..f0763cb1d 100644 --- a/modules/luci-base/Makefile +++ b/modules/luci-base/Makefile @@ -37,9 +37,10 @@ define Host/Compile endef define Host/Install + $(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 + $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(STAGING_DIR)/host/bin/LuaSrcDiet endef $(eval $(call HostBuild)) |