projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[backfire] backport r27648
[openwrt-10.03/.git]
/
include
/
package-defaults.mk
diff --git
a/include/package-defaults.mk
b/include/package-defaults.mk
index 2b5cb8671cc1e9f555fb31411547e967a4148eab..ef51710b9d8d84c8b357d96e2c7156cba83b4c42 100644
(file)
--- a/
include/package-defaults.mk
+++ b/
include/package-defaults.mk
@@
-23,10
+23,15
@@
define Package/Default
else
VERSION:=$(PKG_RELEASE)
endif
else
VERSION:=$(PKG_RELEASE)
endif
- ifneq ($(CONFIG_TARGET_adm5120),y)
- PKGARCH:=$(BOARD)
+ ifneq ($(PKG_FLAGS),)
+ PKGFLAGS:=$(PKG_FLAGS)
+ else
+ PKGFLAGS:=
+ endif
+ ifneq ($(ARCH_PACKAGES),)
+ PKGARCH:=$(ARCH_PACKAGES)
else
else
- PKGARCH:=$(BOARD)
_$(ARCH)
+ PKGARCH:=$(BOARD)
endif
PRIORITY:=optional
DEFAULT:=
endif
PRIORITY:=optional
DEFAULT:=
@@
-37,6
+42,7
@@
define Package/Default
KCONFIG:=
BUILDONLY:=
URL:=
KCONFIG:=
BUILDONLY:=
URL:=
+ VARIANT:=
endef
Build/Patch:=$(Build/Patch/Default)
endef
Build/Patch:=$(Build/Patch/Default)
@@
-121,7
+127,7
@@
define Build/Install/Default
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_INSTALL_FLAGS) \
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_INSTALL_FLAGS) \
- $(
1) install
;
+ $(
if $(1), $(1), install)
;
endef
define Build/Dist/Default
endef
define Build/Dist/Default