X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=1d29119d81fab0aba0a8f3eab81c430ae99000af;hp=017a86d1e8d0d4309d10602093be10aa90b16d1e;hb=c32a125607688264293d2eda27a580009a815696;hpb=579d54038bab2423a65701255db6919f4df51183 diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 017a86d1e8..1d29119d81 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -23,10 +23,15 @@ define Package/Default else VERSION:=$(PKG_RELEASE) endif - ifneq ($(CONFIG_TARGET_adm5120),y) - PKGARCH:=$(BOARD) + ifneq ($(PKG_FLAGS),) + PKGFLAGS:=$(PKG_FLAGS) else - PKGARCH:=$(BOARD)_$(ARCH) + PKGFLAGS:= + endif + ifneq ($(ARCH_PACKAGES),) + PKGARCH:=$(ARCH_PACKAGES) + else + PKGARCH:=$(BOARD) endif PRIORITY:=optional DEFAULT:= @@ -43,7 +48,7 @@ endef Build/Patch:=$(Build/Patch/Default) ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default - $(PKG_UNPACK) + $(SH_FUNC) $(PKG_UNPACK) $(Build/Patch) endef endif @@ -113,7 +118,7 @@ MAKE_PATH = . define Build/Compile/Default $(MAKE_VARS) \ - $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE_FLAGS) \ $(1); endef @@ -122,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