projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "luci-base: use default install paths for host utils"
[project/luci.git]
/
modules
/
luci-base
/
Makefile
diff --git
a/modules/luci-base/Makefile
b/modules/luci-base/Makefile
index
cffce2b
..
f0763cb
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_BASENAME:=base
LUCI_TITLE:=LuCI core libraries
-LUCI_DEPENDS:=+lua +libuci-lua
+LUCI_DEPENDS:=+lua +libuci-lua
+luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc
PKG_SOURCE:=LuaSrcDiet-0.12.1.tar.bz2
PKG_SOURCE_URL:=https://luasrcdiet.googlecode.com/files
PKG_SOURCE:=LuaSrcDiet-0.12.1.tar.bz2
PKG_SOURCE_URL:=https://luasrcdiet.googlecode.com/files
@@
-22,6
+22,10
@@
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/LuaSrcDiet-0.12.1
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/host-build.mk
+define Package/luci-base/conffiles
+/etc/luci-uploads
+endef
+
include ../../luci.mk
define Host/Configure
include ../../luci.mk
define Host/Configure
@@
-33,9
+37,10
@@
define Host/Compile
endef
define Host/Install
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_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))
endef
$(eval $(call HostBuild))