[backfire] backport r27648

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

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 2cfce7a92dc418ea54b20a207459a1d2088f29da..ef51710b9d8d84c8b357d96e2c7156cba83b4c42 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -23,7 +23,16 @@ define Package/Default
   else
     VERSION:=$(PKG_RELEASE)
   endif
-  PKGARCH:=$(BOARD)
+  ifneq ($(PKG_FLAGS),)
+    PKGFLAGS:=$(PKG_FLAGS)
+  else
+    PKGFLAGS:=
+  endif
+  ifneq ($(ARCH_PACKAGES),)
+    PKGARCH:=$(ARCH_PACKAGES)
+  else
+    PKGARCH:=$(BOARD)
+  endif
   PRIORITY:=optional
   DEFAULT:=
   MENU:=
@@ -33,6 +42,7 @@ define Package/Default
   KCONFIG:=
   BUILDONLY:=
   URL:=
+  VARIANT:=
 endef
 
 Build/Patch:=$(Build/Patch/Default)
@@ -117,7 +127,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