Test making a junction to work around win32 python

using stupid names for things
JuliaLang · Feb 23, 2015 · 681ab55 · 681ab55
1 parent 1f20991
commit 681ab55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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