diff --git a/package/ctcgfw/luci-app-k3screenctrl/Makefile b/package/ctcgfw/luci-app-k3screenctrl/Makefile index 7666b5b568..3b2c59c5e0 100644 --- a/package/ctcgfw/luci-app-k3screenctrl/Makefile +++ b/package/ctcgfw/luci-app-k3screenctrl/Makefile @@ -32,18 +32,13 @@ define Package/$(PKG_NAME)/description LuCI Support for k3screenctrl. endef -define Build/Prepare - $(foreach po,$(wildcard ${CURDIR}/files/luci/i18n/*.po), \ - po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));) -endef - define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller - $(INSTALL_DATA) ./files/luci/controller/k3screenctrl.lua $(1)/usr/lib/lua/luci/controller/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - $(INSTALL_DATA) $(PKG_BUILD_DIR)/k3screenctrl.*.lmo $(1)/usr/lib/lua/luci/i18n/ + $(INSTALL_DATA) ./luasrc/controller/k3screenctrl.lua $(1)/usr/lib/lua/luci/controller/ $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi - $(INSTALL_DATA) ./files/luci/model/cbi/k3screenctrl.lua $(1)/usr/lib/lua/luci/model/cbi/ + $(INSTALL_DATA) ./luasrc/model/cbi/k3screenctrl.lua $(1)/usr/lib/lua/luci/model/cbi/ + $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n + po2lmo ./po/zh-cn/k3screenctrl.po $(1)/usr/lib/lua/luci/i18n/k3screenctrl.zh-cn.lmo endef $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.lmo b/package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.lmo deleted file mode 100644 index 4ee5539d5e..0000000000 Binary files a/package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.lmo and /dev/null differ diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/controller/k3screenctrl.lua b/package/ctcgfw/luci-app-k3screenctrl/luasrc/controller/k3screenctrl.lua similarity index 100% rename from package/ctcgfw/luci-app-k3screenctrl/files/luci/controller/k3screenctrl.lua rename to package/ctcgfw/luci-app-k3screenctrl/luasrc/controller/k3screenctrl.lua diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/model/cbi/k3screenctrl.lua b/package/ctcgfw/luci-app-k3screenctrl/luasrc/model/cbi/k3screenctrl.lua similarity index 100% rename from package/ctcgfw/luci-app-k3screenctrl/files/luci/model/cbi/k3screenctrl.lua rename to package/ctcgfw/luci-app-k3screenctrl/luasrc/model/cbi/k3screenctrl.lua diff --git a/package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.po b/package/ctcgfw/luci-app-k3screenctrl/po/zh-cn/k3screenctrl.po similarity index 100% rename from package/ctcgfw/luci-app-k3screenctrl/files/luci/i18n/k3screenctrl.zh-cn.po rename to package/ctcgfw/luci-app-k3screenctrl/po/zh-cn/k3screenctrl.po