From 49a6a98feda89ad05b982cbdd8226923fae07240 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 23 Jul 2020 17:24:46 +0800 Subject: [PATCH] luci-app-adguardhome: simplify Makefile --- package/ctcgfw/luci-app-adguardhome/Makefile | 41 ++++---------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/package/ctcgfw/luci-app-adguardhome/Makefile b/package/ctcgfw/luci-app-adguardhome/Makefile index 4e74bb9290..e5ed3f946c 100644 --- a/package/ctcgfw/luci-app-adguardhome/Makefile +++ b/package/ctcgfw/luci-app-adguardhome/Makefile @@ -8,24 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-adguardhome PKG_VERSION:=1.8 PKG_RELEASE:=11 +PKG_MAINTAINER:= -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) - -include $(INCLUDE_DIR)/package.mk - -define Package/luci-app-adguardhome - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=LuCI app for AdGuardHome - PKG_MAINTAINER:= - PKGARCH:=all - DEPENDS:=+ca-certs +curl +wget +PACKAGE_$(PKG_NAME)_INCLUDE_binary:AdGuardHome -endef - -define Package/luci-app-adguardhome/description - LuCI support for AdGuardHome -endef +LUCI_TITLE:=LuCI app for AdGuardHome +LUCI_PKGARCH:=all +LUCI_DEPENDS:=+ca-certs +curl +wget +PACKAGE_$(PKG_NAME)_INCLUDE_binary:AdGuardHome +LUCI_DESCRIPTION:=LuCI support for AdGuardHome define Package/$(PKG_NAME)/config config PACKAGE_$(PKG_NAME)_INCLUDE_binary @@ -35,26 +23,11 @@ endef PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_binary -define Build/Prepare -endef - -define Build/Compile -endef - define Package/luci-app-adguardhome/conffiles /usr/share/AdGuardHome/links.txt /etc/config/AdGuardHome endef -define Package/luci-app-adguardhome/install - $(INSTALL_DIR) $(1)/usr/lib/lua/luci - cp -pR ./luasrc/* $(1)/usr/lib/lua/luci - $(INSTALL_DIR) $(1)/ - cp -pR ./root/* $(1)/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - po2lmo ./po/zh-cn/AdGuardHome.po $(1)/usr/lib/lua/luci/i18n/AdGuardHome.zh-cn.lmo -endef - define Package/luci-app-adguardhome/postinst #!/bin/sh /etc/init.d/AdGuardHome enable >/dev/null 2>&1 @@ -80,4 +53,6 @@ fi exit 0 endef -$(eval $(call BuildPackage,luci-app-adguardhome)) +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature