X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=2b5cb8671cc1e9f555fb31411547e967a4148eab;hb=e6ceb1cacecee94cadffd0c4cab677c0d21e452e;hp=e7b66b7f8fdffa2e0d3a60586bcb0cf554031574;hpb=04fc02ba10458e675c8878336fc1cf104428256c;p=librecmc%2Flibrecmc.git

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index e7b66b7f8f..2b5cb8671c 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -23,7 +23,11 @@ define Package/Default
   else
     VERSION:=$(PKG_RELEASE)
   endif
-  PKGARCH:=$(ARCH)
+  ifneq ($(CONFIG_TARGET_adm5120),y)
+    PKGARCH:=$(BOARD)
+  else
+    PKGARCH:=$(BOARD)_$(ARCH)
+  endif
   PRIORITY:=optional
   DEFAULT:=
   MENU:=
@@ -61,7 +65,8 @@ CONFIGURE_ARGS = \
 		--mandir=$(CONFIGURE_PREFIX)/man \
 		--infodir=$(CONFIGURE_PREFIX)/info \
 		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE)
+		$(DISABLE_LARGEFILE) \
+		$(DISABLE_IPV6)
 
 CONFIGURE_VARS = \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -84,8 +89,7 @@ define Build/Configure/Default
 		$(2) \
 		$(CONFIGURE_CMD) \
 		$(CONFIGURE_ARGS) \
-		$(1) \
-		$(DISABLE_IPV6); \
+		$(1); \
 	fi; \
 	)
 endef