Merge pull request BVLC#820 from geenux/dev-fixmake

Fix choice of MKL directory from Makefile.config
RazvanRanca · Jul 29, 2014 · d38e324 · d38e324
2 parents ca6ec14 + c2ef4c7
commit d38e324
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -247,7 +247,7 @@ ifeq ($(BLAS), mkl)
 	# MKL
 	LIBRARIES += mkl_rt
 	COMMON_FLAGS += -DUSE_MKL
-	MKL_DIR = /opt/intel/mkl
+	MKL_DIR ?= /opt/intel/mkl
 	BLAS_INCLUDE ?= $(MKL_DIR)/include
 	BLAS_LIB ?= $(MKL_DIR)/lib $(MKL_DIR)/lib/intel64
 else ifeq ($(BLAS), open)