[backfire] merge r23029, r23030, r23031 and r23032

[openwrt-10.03/.git] / include / package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index ecc3af499fd27ce0a0c2533cba4003358eb65a91..1d29181528c545f726a32117404cdb820be72a6d 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -23,10 +23,10 @@ define Package/Default
   else
     VERSION:=$(PKG_RELEASE)
   endif
-  ifneq ($(CONFIG_TARGET_adm5120),y)
-    PKGARCH:=$(BOARD)
+  ifneq ($(ARCH_PACKAGES),)
+    PKGARCH:=$(ARCH_PACKAGES)
   else
-    PKGARCH:=$(BOARD)_$(ARCH)
+    PKGARCH:=$(BOARD)
   endif
   PRIORITY:=optional
   DEFAULT:=