WINDOWS: move dll files to bin, where they belong

.gitignore

@@ -5,6 +5,7 @@
 /julia
 /usr
 /Make.user
+/julia-*
 
 *.exe
 *.dll

Make.inc

@@ -50,7 +50,9 @@ override OPENBLAS_DYNAMIC_ARCH = 1
 override CROSS_COMPILE=$(XC_HOST)-
 ifneq (,$(findstring mingw,$(XC_HOST)))
 override OS := WINNT
-export WINE_PATH := $(shell winepath -w $(BUILD)/bin);$(shell winepath -w $(BUILD)/lib/julia);$(shell winepath -w $(BUILD)/lib)
+JL_PRIVATE_LIBDIR = bin
+JL_LIBDIR = bin
+export WINE_PATH := $(shell winepath -w $(BUILD)/bin);$(shell winepath -w $(BUILD)/$(JL_LIBDIR));$(shell winepath -w $(BUILD)/$(JL_PRIVATE_LIBDIR))
 export WINE_PATH := $(WINE_PATH);$(shell $(CROSS_COMPILE)gcc -print-search-dirs | grep programs | sed "s/^programs: =https://" | xargs -d":" winepath -w | tr '\n' ';')
 export WINE_PATH := $(WINE_PATH);$(shell $(CROSS_COMPILE)gcc -print-search-dirs | grep libraries | sed "s/^libraries: =https://" | xargs -d":" winepath -w | tr '\n' ';')
 export WINE_PATH := $(WINE_PATH);C:\MinGW\\bin;C:\MinGW\msys\1.0\bin;$(shell winepath -w $(BUILD)/Git/bin)
@@ -81,7 +83,7 @@ endif
 ifeq ($(OS), WINNT)
 fPIC =
 ifeq ($(BUILD_OS), WINNT)
-PATH := ${PATH}:${BUILD}/lib:${BUILD}/lib/julia:/c/Program Files/7-zip
+PATH := ${PATH}:${BUILD}/${JL_LIBDIR}:${BUILD}/${JL_PRIVATE_LIBDIR}:/c/Program Files/7-zip
 endif
 EXE = .exe
 else
@@ -253,14 +255,14 @@ ifeq ($(USE_SYSTEM_BLAS), 1)
 ifeq ($(OS), Darwin)
 USE_BLAS64 = 0
 USE_SYSTEM_LAPACK = 0
-LIBBLAS = -L$(BUILD)/lib -lgfortblas
+LIBBLAS = -L$(BUILD)/$(JL_LIBDIR) -lgfortblas
 LIBBLASNAME = libgfortblas
 else
 LIBBLAS ?= -lblas
 LIBBLASNAME ?= libblas
 endif
 else
-LIBBLAS = -L$(BUILD)/lib -lopenblas
+LIBBLAS = -L$(BUILD)/$(JL_LIBDIR) -lopenblas
 LIBBLASNAME = libopenblas
 endif
 
@@ -274,7 +276,7 @@ ifeq ($(USE_SYSTEM_LAPACK), 1)
 LIBLAPACK = -llapack
 LIBLAPACKNAME = liblapack
 else
-LIBLAPACK = -L$(BUILD)/lib -llapack $(LIBBLAS)
+LIBLAPACK = -L$(BUILD)/$(JL_LIBDIR) -llapack $(LIBBLAS)
 LIBLAPACKNAME = liblapack
 endif
 endif

Makefile

@@ -13,7 +13,19 @@ VERSDIR = v`cut -d. -f1-2 < VERSION`
 all: default
 default: release
 
-DIRS = $(BUILD)/bin $(BUILD)/lib $(BUILD)/$(JL_PRIVATE_LIBDIR) $(BUILD)/share/julia $(BUILD)/share/julia/man/man1
+DIRS = $(BUILD)/bin $(BUILD)/lib $(BUILD)/share/julia $(BUILD)/share/julia/man/man1
+ifneq ($(JL_LIBDIR),bin)
+ifneq ($(JL_LIBDIR),lib)
+DIRS += $(BUILD)/$(JL_LIBDIR)
+endif
+endif
+ifneq ($(JL_PRIVATE_LIBDIR),bin)
+ifneq ($(JL_PRIVATE_LIBDIR),lib)
+ifneq ($(JL_PRIVATE_LIBDIR),$(JL_LIBDIR))
+DIRS += $(BUILD)/$(JL_PRIVATE_LIBDIR)
+endif
+endif
+endif
 
 $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir))))
 $(foreach link,base test doc examples,$(eval $(call symlink_target,$(link),$(BUILD)/share/julia)))
@@ -93,7 +105,7 @@ endif
  cp -a $(BUILD)/$(JL_LIBDIR)/lib$${suffix}*.$(SHLIB_EXT)* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
  done
  -for suffix in $(JL_PRIVATE_LIBS) ; do \
- cp -a $(BUILD)/lib/lib$${suffix}*.$(SHLIB_EXT)* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
+ cp -a $(BUILD)/$(JL_LIBDIR)/lib$${suffix}*.$(SHLIB_EXT)* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
  done
 ifeq ($(USE_SYSTEM_LIBUV),0)
  cp -a $(BUILD)/lib/libuv.a $(PREFIX)/$(JL_PRIVATE_LIBDIR)

contrib/windows/prepare-julia-env.bat

@@ -11,7 +11,7 @@ set PATH=%~dp0bin;%~dp0usr\bin;%~dp0..\usr\bin;%~dp0..\..\usr\bin;%SYS_PATH%
 set JULIA_EXE=julia-readline.exe
 for %%A in (%JULIA_EXE%) do set JULIA_HOME=%%~dp$PATH:A
 set JULIA=%JULIA_HOME%%JULIA_EXE%
-set PATH=%JULIA_HOME%;%JULIA_HOME%..\lib\julia;%JULIA_HOME%..\lib;.;%SYS_PATH%;%~dp0\Git\bin;C:\MinGW\msys\1.0\bin;C:\MinGW\bin;C:\Program Files\Git\bin;C:\Program Files (x86)\Git\bin;C:\Python27;C:\Python26;C:\Python25
+set PATH=%JULIA_HOME%;.;%SYS_PATH%;%~dp0\Git\bin;C:\MinGW\msys\1.0\bin;C:\MinGW\bin;C:\Program Files\Git\bin;C:\Program Files (x86)\Git\bin;C:\Python27;C:\Python26;C:\Python25
 set HOME=%APPDATA%\julia
 set JL_PRIVATE_LIBDIR=lib\julia
 set JULIA_EDITOR=start