From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 12 Mar 2014 19:53:13 +0000 (+0000)
Subject: build: fix installation of default-variant packages when the source package has multi... 
X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=aa1511ca8a9b3457ebe881cc4d9b223ff51432be

build: fix installation of default-variant packages when the source package has multiple variants (#15237)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39899 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/Makefile b/package/Makefile
index f82654cf90..d46cb2ca0e 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -76,7 +76,7 @@ OPKG:= \
 PACKAGE_INSTALL_FILES:= \
 	$(foreach pkg,$(sort $(package-y)), \
 		$(foreach variant, \
-			$(if $(package/$(pkg)/variants), \
+			$(if $(strip $(package/$(pkg)/variants)), \
 				$(package/$(pkg)/variants), \
 				$(if $(package/$(pkg)/default-variant), \
 					$(package/$(pkg)/default-variant), \