build: fix installation of default-variant packages when the source package has multi...
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 12 Mar 2014 19:53:13 +0000 (19:53 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 12 Mar 2014 19:53:13 +0000 (19:53 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39899 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/Makefile

index f82654c..d46cb2c 100644 (file)
@@ -76,7 +76,7 @@ OPKG:= \
 PACKAGE_INSTALL_FILES:= \
        $(foreach pkg,$(sort $(package-y)), \
                $(foreach variant, \
 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), \
                                $(package/$(pkg)/variants), \
                                $(if $(package/$(pkg)/default-variant), \
                                        $(package/$(pkg)/default-variant), \