[CalendarServer-changes] [13387] CalendarServer/trunk/support/Apple.make

[source_changes at macosforge.org]

Revision: 13387
          http://trac.calendarserver.org//changeset/13387
Author:   wsanchez at apple.com
Date:     2014-04-30 15:09:08 -0700 (Wed, 30 Apr 2014)
Log Message:
-----------
Get PYTHONPATH right when bootstrapping.

Modified Paths:
--------------
    CalendarServer/trunk/support/Apple.make

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2014-04-30 22:08:49 UTC (rev 13386)
+++ CalendarServer/trunk/support/Apple.make	2014-04-30 22:09:08 UTC (rev 13387)
@@ -102,7 +102,7 @@
 	@#
 	@echo "Installing Python packages...";
 	$(_v) for pkg in $$(find "$(Sources)/.develop/pip_downloads" -type f); do \
-	          $(Environment) PYTHONPATH="$(BuildDirectory)/pytools/lib"       \
+	          $(Environment)                                                  \
 	              "$(DSTROOT)$(CS_VIRTUALENV)/bin/pip" install                \
                       --pre --allow-all-external --no-index --no-deps         \
 	                  --log=/tmp/pip.log                                      \
@@ -112,7 +112,8 @@
 	@# Make the virtualenv relocatable
 	@#
 	@echo "Making virtual environment relocatable...";
-	$(PYTHON) -m virtualenv --relocatable "$(DSTROOT)$(CS_VIRTUALENV)";
+	PYTHONPATH="$(BuildDirectory)/pytools/lib" \
+	    $(PYTHON) -m virtualenv --relocatable "$(DSTROOT)$(CS_VIRTUALENV)";
 	@#
 	@# Clean up
 	@#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140430/0e1997c2/attachment-0001.html>