X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=ecc3af499fd27ce0a0c2533cba4003358eb65a91;hp=3cba736f0f101d282b4033d1056ebe97f4836e11;hb=e09067b221cbea860a7d830dc84a259810f1501d;hpb=11e1304ca0d2be464d881fca375f22deafd52536 diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 3cba736f0f..ecc3af499f 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) @@ -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