X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2FMakefile;h=df7cf79f2ec736e9315d13b08496adc5e35d7469;hb=2561bce232fc720476a9e45217fa4054c59599d1;hp=e88efdfe9f692e6061b3843041af6c4a1bfb6fc8;hpb=a99b0363d0e3974087695f47f3c60b8959ae815a;p=oweals%2Fopenwrt.git

diff --git a/package/Makefile b/package/Makefile
index e88efdfe9f..df7cf79f2e 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -70,8 +70,19 @@ OPKG:= \
 	--add-arch all:100 \
 	--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
 
-PACKAGE_INSTALL:=$(sort $(foreach pkg,$(package-y),$(lastword $(subst /,$(space),$(pkg)))))
-PACKAGE_INSTALL_FILES:=$(patsubst %,$(PKG_INFO_DIR)/%.*.install,$(PACKAGE_INSTALL))
+PACKAGE_INSTALL_FILES:= \
+	$(foreach pkg,$(sort $(package-y)), \
+		$(foreach variant, \
+			$(if $(package/$(pkg)/variants), \
+				$(package/$(pkg)/variants), \
+				$(if $(package/$(pkg)/default-variant), \
+					$(package/$(pkg)/default-variant), \
+					default \
+				) \
+			), \
+			$(PKG_INFO_DIR)/$(lastword $(subst /,$(space),$(pkg))).$(variant).install \
+		) \
+	)
 
 $(curdir)/cleanup: $(TMP_DIR)/.build
 	rm -rf $(STAGING_DIR_ROOT)