X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b1257bc84fb6ae74053ae42925fe2d941ffc8cc1..22a6beb304aeb2cce935c238c2d51b3fac451e85:/include/package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index e7b66b7f8..ecc3af499 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:=
@@ -33,6 +37,7 @@ define Package/Default
   KCONFIG:=
   BUILDONLY:=
   URL:=
+  VARIANT:=
 endef
 
 Build/Patch:=$(Build/Patch/Default)
@@ -61,7 +66,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 +90,7 @@ define Build/Configure/Default
 		$(2) \
 		$(CONFIGURE_CMD) \
 		$(CONFIGURE_ARGS) \
-		$(1) \
-		$(DISABLE_IPV6); \
+		$(1); \
 	fi; \
 	)
 endef
@@ -117,7 +122,7 @@ define Build/Install/Default
 	$(MAKE_VARS) \
 	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
 		$(MAKE_INSTALL_FLAGS) \
-		$(1) install;
+		$(if $(1), $(1), install);
 endef
 
 define Build/Dist/Default