From 051dcb72bdf7aaf91a33fceb91701e93ec5061c3 Mon Sep 17 00:00:00 2001
From: Beginner <70857188+Beginner-Go@users.noreply.github.com>
Date: Tue, 20 Jul 2021 09:59:15 +0800
Subject: [PATCH] luci-app-unblockmusic: tidy up Makefile (#7442)

Signed-off-by: Beginner <70857188+Beginner-Go@users.noreply.github.com>
---
 package/lean/luci-app-unblockmusic/Config.in |  9 ------
 package/lean/luci-app-unblockmusic/Makefile  | 32 +++++++++++++-------
 2 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 package/lean/luci-app-unblockmusic/Config.in

diff --git a/package/lean/luci-app-unblockmusic/Config.in b/package/lean/luci-app-unblockmusic/Config.in
deleted file mode 100644
index 5ff3ec707..000000000
--- a/package/lean/luci-app-unblockmusic/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-config UnblockNeteaseMusic_Go
-	bool "UnblockNeteaseMusic Golang Version"
-	default y if i386||x86_64||arm||aarch64
-
-config UnblockNeteaseMusic_NodeJS
-	bool "UnblockNeteaseMusic NodeJS Version"
-	depends on HAS_FPU || KERNEL_MIPS_FPU_EMULATOR || SOFT_FLOAT
-	default n
diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile
index 05863ef6c..80ade46bd 100644
--- a/package/lean/luci-app-unblockmusic/Makefile
+++ b/package/lean/luci-app-unblockmusic/Makefile
@@ -10,25 +10,35 @@ PKG_NAME:=luci-app-unblockmusic
 PKG_VERSION:=2.3.5
 PKG_RELEASE:=17
 
+PKG_MAINTAINER:=lean
+
 PKG_CONFIG_DEPENDS := \
-	CONFIG_UnblockNeteaseMusic_Go \
-	CONFIG_UnblockNeteaseMusic_NodeJS
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)/config
-  source "$(SOURCE)/Config.in"
-endef
+	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_UnblockNeteaseMusic_Go \
+	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_UnblockNeteaseMusic_NodeJS
 
 PKG_LICENSE:=Apache-2.0
 
 LUCI_TITLE:=LuCI support for Unblock NeteaseCloudMusic
-LUCI_DEPENDS:=+dnsmasq-full +ipset +uclient-fetch +UnblockNeteaseMusic_NodeJS:UnblockNeteaseMusic +UnblockNeteaseMusic_Go:UnblockNeteaseMusicGo
 LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+dnsmasq-full +ipset +uclient-fetch \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_UnblockNeteaseMusic_Go:UnblockNeteaseMusic-Go \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_UnblockNeteaseMusic_NodeJS:UnblockNeteaseMusic
 
-PKG_MAINTAINER:=lean
+define Package/$(PKG_NAME)/config
+config PACKAGE_$(PKG_NAME)_INCLUDE_INCLUDE_UnblockNeteaseMusic_Go
+	bool "UnblockNeteaseMusic Golang Version"
+	default y if i386||x86_64||arm||aarch64
+
+config PACKAGE_$(PKG_NAME)_INCLUDE_INCLUDE_UnblockNeteaseMusic_NodeJS
+	bool "UnblockNeteaseMusic NodeJS Version"
+	depends on HAS_FPU || KERNEL_MIPS_FPU_EMULATOR || SOFT_FLOAT
+	default n
+endef
+
+define Package/$(PKG_NAME)/conffiles
+/etc/config/unblockmusic
+endef
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
-