--- a/make-rules/setup.py.mk Thu Apr 16 01:36:32 2015 -0700
+++ b/make-rules/setup.py.mk Mon Apr 20 12:35:51 2015 -0700
@@ -18,7 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
$(BUILD_DIR)/%-2.6/.built: PYTHON_VERSION=2.6
@@ -85,7 +87,7 @@
$(TOUCH) $@
-COMPONENT_INSTALL_ARGS += --root $(PROTO_DIR)
+COMPONENT_INSTALL_ARGS += --root $(PROTO_DIR)
COMPONENT_INSTALL_ARGS += --install-lib=$(PYTHON_LIB)
COMPONENT_INSTALL_ARGS += --install-purelib=$(PYTHON_LIB)
COMPONENT_INSTALL_ARGS += --install-platlib=$(PYTHON_LIB)
@@ -126,6 +128,10 @@
clean::
$(RM) -r $(SOURCE_DIR) $(BUILD_DIR)
-# Make it easy to construct a URL for a pypi source download.
+# Make it easy to construct a URL for a pypi source download. This
+# construct supports an optional call to a number from
+# NUM_EXTRA_ARCHIVES for multiple archive downloads.
PYPI_BASE = http://pypi.python.org/packages/source
-pypi_url = $(PYPI_BASE)/$(shell echo $(COMPONENT_NAME) | cut -c1)/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+pypi_url_multi = $(shell echo $(COMPONENT_NAME_$(1)) | cut -c1)/$(COMPONENT_NAME_$(1))/$(COMPONENT_ARCHIVE_$(1))
+pypi_url_single = $(shell echo $(COMPONENT_NAME) | cut -c1)/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+pypi_url = $(PYPI_BASE)/$(if $(COMPONENT_NAME_$(1)),$(pypi_url_multi),$(pypi_url_single))