Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / modules / luci-base / Makefile

diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index 5c38d99c589621dbaa00aad78afcd6c814d54afc..92da37a2224492d635a49ce915535eb17ead5457 100644 (file)
--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@@ -12,7 +12,7 @@ LUCI_TYPE:=mod
 LUCI_BASENAME:=base
 
 LUCI_TITLE:=LuCI core libraries
-LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc +liblucihttp-lua
+LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc +liblucihttp-lua +rpcd-mod-file +cgi-io
 
 
 PKG_SOURCE:=v1.0.0.tar.gz
@@ -36,14 +36,16 @@ define Host/Configure
 endef
 
 define Host/Compile
-       $(MAKE) -C src/ clean po2lmo
-       $(MAKE) -C $(HOST_BUILD_DIR) bin/luasrcdiet
+       $(MAKE) -C src/ clean po2lmo jsmin
 endef
 
 define Host/Install
        $(INSTALL_DIR) $(1)/bin
+       $(INSTALL_DIR) $(1)/lib/lua/5.1
        $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo
+       $(INSTALL_BIN) src/jsmin $(1)/bin/jsmin
        $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/luasrcdiet $(1)/bin/luasrcdiet
+       $(CP) $(HOST_BUILD_DIR)/luasrcdiet $(1)/lib/lua/5.1/
 endef
 
 $(eval $(call HostBuild))