From: Jo-Philipp Wich Date: Wed, 2 Jul 2014 11:39:28 +0000 (+0000) Subject: include: remove SDK exception from package install targets X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=28f44a4f910046267a943349f71501991c15d573;p=openwrt%2Fstaging%2Fdedeckeh.git include: remove SDK exception from package install targets Signed-off-by: Jo-Philipp Wich SVN-Revision: 41459 --- diff --git a/include/package-bin.mk b/include/package-bin.mk index dcb3a8acba..c6cb9caf41 100644 --- a/include/package-bin.mk +++ b/include/package-bin.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ ifeq ($(DUMP),) define BuildTarget/bin ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT)) ifdef Package/$(1)/install - ifneq ($(CONFIG_PACKAGE_$(1))$(SDK)$(DEVELOPER),) + ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) compile: install-bin-$(1) else compile: $(1)-disabled diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index cb2a4087fe..9783a63254 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006,2007 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -80,7 +80,7 @@ ifeq ($(DUMP),) ifeq ($(BUILD_VARIANT),$$(if $$(VARIANT),$$(VARIANT),$(BUILD_VARIANT))) ifdef Package/$(1)/install - ifneq ($(CONFIG_PACKAGE_$(1))$(SDK)$(DEVELOPER),) + ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) IPKGS += $(1) compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(STAGING_DIR_ROOT)/stamp/.$(1)_installed ifneq ($(ABI_VERSION),)