diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2016-10-10 19:06:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-10 19:06:33 +0300 |
| commit | 3af8b3c5b6ccf0c87c0188772d8e1be8870fc214 (patch) | |
| tree | ed787f20036e88d54c8378981b2f40622ff6f0af | |
| parent | e06c60a0d669bed72e495d51f5e30513b05f5605 (diff) | |
| parent | 4d97a9f6986fb37ce7e69a1ca3f4743334495654 (diff) | |
Merge pull request #822 from NeoRaider/staging-dir-host
luci-base: use default install paths for host utils (again)
| -rw-r--r-- | luci.mk | 3 | ||||
| -rw-r--r-- | modules/luci-base/Makefile | 7 |
2 files changed, 4 insertions, 6 deletions
@@ -150,8 +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 \ - --noopt-binequiv -o "$$$$src.o" "$$$$src"; \ + if 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 f0763cb1df..972a451c69 100644 --- a/modules/luci-base/Makefile +++ b/modules/luci-base/Makefile @@ -37,10 +37,9 @@ 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_DIR) $(1)/bin + $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo + $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(1)/bin/LuaSrcDiet endef $(eval $(call HostBuild)) |