diff --git a/package/ctcgfw/luci-app-adguardhome/Makefile b/package/ctcgfw/luci-app-adguardhome/Makefile index cbf0e0b5dd..e5ed3f946c 100644 --- a/package/ctcgfw/luci-app-adguardhome/Makefile +++ b/package/ctcgfw/luci-app-adguardhome/Makefile @@ -9,12 +9,19 @@ PKG_NAME:=luci-app-adguardhome PKG_VERSION:=1.8 PKG_RELEASE:=11 PKG_MAINTAINER:= -LUCI_TITLE:=LuCI app for adguardhome -LUCI_PKGARCH:=all -LUCI_DEPENDS:=+!wget&&!curl:wget -LUCI_DESCRIPTION:=LuCI support for adguardhome -include $(TOPDIR)/feeds/luci/luci.mk +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 + bool "Include Binary File" + default y +endef + +PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_binary define Package/luci-app-adguardhome/conffiles /usr/share/AdGuardHome/links.txt @@ -46,4 +53,6 @@ fi exit 0 endef +include $(TOPDIR)/feeds/luci/luci.mk + # call BuildPackage - OpenWrt buildroot signature diff --git a/package/ntlf9t/AdGuardHome/Makefile b/package/ntlf9t/AdGuardHome/Makefile index 4d77bcd39d..0244ff7a66 100644 --- a/package/ntlf9t/AdGuardHome/Makefile +++ b/package/ntlf9t/AdGuardHome/Makefile @@ -55,7 +55,9 @@ define Build/Compile endef define Package/AdGuardHome/install - $(call GoPackage/Package/Install/Bin,$(1)) + $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) + $(INSTALL_DIR) $(1)/usr/bin/AdGuardHome + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/AdGuardHome $(1)/usr/bin/AdGuardHome/AdGuardHome endef $(eval $(call GoBinPackage,AdGuardHome))