rpcd: move menu.d to /usr/share/rpcd

diff --git a/luci2/Makefile b/luci2/Makefile
index 88cf3e05ba3c6a3ea5def1d9d15d88725b2e91aa..e83cf51de527d73834419228c2aa4b9756cab9ee 100644 (file)
--- a/luci2/Makefile
+++ b/luci2/Makefile
@@ -37,8 +37,8 @@ endef
 define Package/luci2/install
        $(INSTALL_DIR) $(1)/www
        $(CP) ./htdocs/* $(1)/www/
-       $(INSTALL_DIR) $(1)/usr/share/luci2
-       $(CP) ./share/* $(1)/usr/share/luci2/
+       $(INSTALL_DIR) $(1)/usr/share/rpcd
+       $(CP) ./share/* $(1)/usr/share/rpcd/
        $(INSTALL_DIR) $(1)/usr/lib/rpcd
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/rpcd/luci2.so $(1)/usr/lib/rpcd/
        $(INSTALL_DIR) $(1)/usr/libexec $(1)/www/cgi-bin

diff --git a/luci2/src/rpcd/luci2.c b/luci2/src/rpcd/luci2.c
index 2b1a7501c438d5a5538c39626956ff06f1dafdbf..23bd629eb9f71963a9b1be366be47d5775f08f1e 100644 (file)
--- a/luci2/src/rpcd/luci2.c
+++ b/luci2/src/rpcd/luci2.c
@@ -41,7 +41,7 @@
 #define RPC_LUCI2_DEF_LOGSIZE       (16 * 1024)
 
 /* location of menu definitions */
-#define RPC_LUCI2_MENU_FILES        "/usr/share/luci2/menu.d/*.json" /* */
+#define RPC_LUCI2_MENU_FILES        "/usr/share/rpcd/menu.d/*.json" /* */
 
 
 static const struct rpc_daemon_ops *ops;