X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=modules%2Fluci-base%2FMakefile;h=ea233091017d5e76c4147fb1e7c1bffec7bfcfc5;hb=852d24061d236048a8c2c886787eede2586b10b4;hp=d3039ef41b9d843591522084e6dc91c6a34082f7;hpb=b121f958621efd5d81451e2de3e7d35a828645bc;p=oweals%2Fluci.git

diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index d3039ef41..ea2330910 100644
--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@@ -12,15 +12,15 @@ LUCI_TYPE:=mod
 LUCI_BASENAME:=base
 
 LUCI_TITLE:=LuCI core libraries
-LUCI_DEPENDS:=+lua +libuci-lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc
-LUCI_EXTRA_DEPENDS:=libuci-lua (>= 2018-01-01)
+LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc +liblucihttp-lua +rpcd-mod-file +rpcd-mod-luci +cgi-io
 
-PKG_SOURCE:=LuaSrcDiet-0.12.1.tar.bz2
-PKG_SOURCE_URL:=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/luasrcdiet
-PKG_HASH:=ed7680f2896269ae8633756e7edcf09050812f78c8f49e280e63c30d14f35aea
-PKG_LICENSE:=Apache-2.0
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/LuaSrcDiet-0.12.1
+PKG_SOURCE:=v1.0.0.tar.gz
+PKG_SOURCE_URL:=https://github.com/jirutka/luasrcdiet/archive/
+PKG_HASH:=48162e63e77d009f5848f18a5cabffbdfc867d0e5e73c6d407f6af5d6880151b
+PKG_LICENSE:=MIT
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/luasrcdiet-1.0.0
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -36,14 +36,16 @@ define Host/Configure
 endef
 
 define Host/Compile
-	$(MAKE) -C src/ clean po2lmo
-	$(MAKE) -C $(HOST_BUILD_DIR) bin/LuaSrcDiet.lua
+	$(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) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(1)/bin/LuaSrcDiet
+	$(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))