diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk
index d89c108867..c337a6489b 100755
--- a/makefiles/Makefile.java.mk
+++ b/makefiles/Makefile.java.mk
@@ -248,7 +248,7 @@ $(JAVA_OR_TOOLS_LIBS): \
  $(GEN_DIR)/com/google/ortools/sat/SatParameters.java \
  $(GEN_DIR)/com/google/ortools/sat/CpModel.java | \
  $(CLASS_DIR)/com/google/ortools
-	$(JAVAC_BIN) -d $(CLASS_DIR) \
+	"$(JAVAC_BIN)" -d $(CLASS_DIR) \
  -cp $(LIB_DIR)$Sprotobuf.jar \
  $(SRC_DIR)$Sortools$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java \
  $(SRC_DIR)$Sortools$Scom$Sgoogle$Sortools$Ssat$S*.java \
@@ -257,7 +257,7 @@ $(JAVA_OR_TOOLS_LIBS): \
  $(GEN_PATH)$Scom$Sgoogle$Sortools$Salgorithms$S*.java \
  $(GEN_PATH)$Scom$Sgoogle$Sortools$Sgraph$S*.java \
  $(GEN_PATH)$Scom$Sgoogle$Sortools$Slinearsolver$S*.java
-	$(JAR_BIN) cvf $(LIB_DIR)$Scom.google.ortools.jar -C $(CLASS_DIR) com$Sgoogle$Sortools$S
+	"$(JAR_BIN)" cvf $(LIB_DIR)$Scom.google.ortools.jar -C $(CLASS_DIR) com$Sgoogle$Sortools$S
 
 #############################
 ##  Java Examples/Samples  ##
diff --git a/makefiles/Makefile.third_party.unix.mk b/makefiles/Makefile.third_party.unix.mk
index a907196ceb..69cc2351d3 100644
--- a/makefiles/Makefile.third_party.unix.mk
+++ b/makefiles/Makefile.third_party.unix.mk
@@ -318,9 +318,9 @@ dependencies/install/lib/protobuf.jar: | dependencies/install/lib/libprotobuf.$L
  $(PROTOC) --java_out=core/src/main/java -I../src \
  ../src/google/protobuf/descriptor.proto
 	cd dependencies/sources/protobuf-$(PROTOBUF_TAG)/java/core/src/main/java && \
- $(JAVAC_BIN) com/google/protobuf/*java
+ "$(JAVAC_BIN)" com/google/protobuf/*java
 	cd dependencies/sources/protobuf-$(PROTOBUF_TAG)/java/core/src/main/java && \
- $(JAR_BIN) cvf ../../../../../../../install/lib/protobuf.jar com/google/protobuf/*class
+ "$(JAR_BIN)" cvf ../../../../../../../install/lib/protobuf.jar com/google/protobuf/*class
 
 ############################################
 ##  Install Patchelf on linux platforms.  ##
diff --git a/makefiles/Makefile.third_party.win.mk b/makefiles/Makefile.third_party.win.mk
index 864af41d89..7bb2326150 100644
--- a/makefiles/Makefile.third_party.win.mk
+++ b/makefiles/Makefile.third_party.win.mk
@@ -331,8 +331,8 @@ dependencies/install/lib/protobuf.jar: | dependencies/install/bin/protoc.exe
 	cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java && \
 	  ..\\..\\..\\install\\bin\\protoc --java_out=core/src/main/java -I../src \
 	  ../src/google/protobuf/descriptor.proto
-	cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\core\\src\\main\\java && $(JAVAC_BIN) com\\google\\protobuf\\*java
-	cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\core\\src\\main\\java && $(JAR_BIN) cvf ..\\..\\..\\..\\..\\..\\..\\install\\lib\\protobuf.jar com\\google\\protobuf\\*class
+	cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\core\\src\\main\\java && "$(JAVAC_BIN)" com\\google\\protobuf\\*java
+	cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\core\\src\\main\\java && "$(JAR_BIN)" cvf ..\\..\\..\\..\\..\\..\\..\\install\\lib\\protobuf.jar com\\google\\protobuf\\*class
 
 ############
 ##  COIN  ##
diff --git a/makefiles/Makefile.win.mk b/makefiles/Makefile.win.mk
index 124a177c50..5ac366cb2a 100644
--- a/makefiles/Makefile.win.mk
+++ b/makefiles/Makefile.win.mk
@@ -148,9 +148,9 @@ SWIG_INC = \
 SYS_LNK = psapi.lib ws2_32.lib shlwapi.lib
 
 JAVA_INC=/I"$(JAVA_HOME)\\include" /I"$(JAVA_HOME)\\include\\win32"
-JAVAC_BIN="$(shell $(WHICH) "$(JAVA_HOME)\bin\javac")"
-JAVA_BIN="$(shell $(WHICH) "$(JAVA_HOME)\bin\java")"
-JAR_BIN="$(shell $(WHICH) "$(JAVA_HOME)\bin\jar")"
+JAVAC_BIN=$(shell $(WHICH) "$(JAVA_HOME)\bin\javac")
+JAVA_BIN=$(shell $(WHICH) "$(JAVA_HOME)\bin\java")
+JAR_BIN=$(shell $(WHICH) "$(JAVA_HOME)\bin\jar")
 
 DEPENDENCIES_INC = /I$(INC_DIR) /I$(EX_DIR) /I$(GEN_DIR) \
  $(ZLIB_INC) $(GFLAGS_INC) $(GLOG_INC) $(PROTOBUF_INC) \