summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2011-02-23 16:45:57 -0800
committerRaphael <raphael@google.com>2011-02-23 22:34:16 -0800
commit3e54830dc89794e17b3334190c0183faa40ac4d6 (patch)
tree1af789e418fdd66c8ebe000fae3962037901367e /core
parentc4e93b7e111b79666f9947977e3450bf8d0b297b (diff)
downloadbuild-3e54830dc89794e17b3334190c0183faa40ac4d6.zip
build-3e54830dc89794e17b3334190c0183faa40ac4d6.tar.gz
build-3e54830dc89794e17b3334190c0183faa40ac4d6.tar.bz2
Fix for SDK repository.
Change-Id: Ia1245226c451ed4539a0a0cd51022a3325f4b33b
Diffstat (limited to 'core')
-rw-r--r--core/tasks/sdk-addon.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk
index e21fedc..afcda23 100644
--- a/core/tasks/sdk-addon.mk
+++ b/core/tasks/sdk-addon.mk
@@ -94,11 +94,16 @@ $(full_target): $(sdk_addon_deps) | $(ACP)
.PHONY: sdk_addon
sdk_addon: $(full_target)
-# Keep the name of the addon final zip around for sdk_repo.
-# This is used by development/build/tools/sdk_repo.mk.
+ifneq ($(sdk_repo_goal),)
+# If we're building the sdk_repo, keep the name of the addon zip
+# around so that development/build/tools/sdk_repo.mk can dist it
+# at the appropriate location.
ADDON_SDK_ZIP := $(full_target)
-
+else
+# When not building an sdk_repo, just dist the addon zip file
+# as-is.
$(call dist-for-goals, sdk_addon, $(full_target))
+endif
else # addon_name
ifneq ($(filter sdk_addon,$(MAKECMDGOALS)),)