From 681ab55a58a89c6236cbdec293c448d3596ba32a Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Mon, 23 Feb 2015 00:34:20 -0800 Subject: [PATCH] Test making a junction to work around win32 python using stupid names for things --- deps/Makefile | 3 +++ doc/Makefile | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index 3ae7d990fe36c..15605ad6308ef 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -1771,6 +1771,9 @@ $(VIRTUALENV_SOURCE): virtualenv-$(VIRTUALENV_VER).tar.gz touch -c $@ $(VIRTUALENV_TARGET): $(VIRTUALENV_SOURCE) "$(shell ./find_python2)" $< $@ +ifeq ($(BUILD_OS), WINNT) + [ -e $@/Scripts ] && ! [ -e $@/bin ] && cmd //C mklink //J $@/bin $@/Scripts +endif touch -c $@ clean-virtualenv: diff --git a/doc/Makefile b/doc/Makefile index e08e58c2051cb..30e10819afa74 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -14,10 +14,8 @@ ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . JULIA_ENV = $(JULIAHOME)/deps/julia-env -# Win32 Python uses /Scripts instead of /bin -JULIA_ENV_BIN = $(shell if [ -e $(JULIA_ENV)/Scripts ]; then echo $(JULIA_ENV)/Scripts; else echo $(JULIA_ENV)/bin; fi) -ACTIVATE = $(JULIA_ENV_BIN)/activate -SPHINX_BUILD = $(JULIA_ENV_BIN)/sphinx-build +ACTIVATE = $(JULIA_ENV)/bin/activate +SPHINX_BUILD = $(JULIA_ENV)/bin/sphinx-build $(JULIA_ENV): $(MAKE) -C $(JULIAHOME)/deps install-virtualenv