Bug 3015312: Makefiles are not quoted correctly

CHANGES.txt

@@ -25,6 +25,7 @@
 * Bug 3034222: StaticLib projects ignore linkoptions
 * Bug 3020382: GCC PCH not working
 * Bug 3016050: {"../Dir/file1.c","../../Dir/file2.c"} breaks Xcode (Stephane)
+* Bug 3015312: Makefiles are not quoted correctly
 
 
 -------

src/actions/make/make_cpp.lua

@@ -114,14 +114,14 @@
 				_p('$(OBJDIR)/%s.o: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))
 				_p('\t@echo $(notdir $<)')
 				if (path.iscfile(file)) then
-					_p('\t$(SILENT) $(CC) $(CFLAGS) -o $@ -c $<')
+					_p('\t$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"')
 				else
-					_p('\t$(SILENT) $(CXX) $(CXXFLAGS) -o $@ -c $<')
+					_p('\t$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"')
 				end
 			elseif (path.getextension(file) == ".rc") then
 				_p('$(OBJDIR)/%s.res: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))
 				_p('\t@echo $(notdir $<)')
-				_p('\t$(SILENT) windres $< -O coff -o $@ $(RESFLAGS)')
+				_p('\t$(SILENT) windres $< -O coff -o "$@" $(RESFLAGS)')
 			end
 		end
 		_p('')
@@ -260,9 +260,9 @@
 		_p('\t@echo $(notdir $<)')
 		_p('\t-$(SILENT) cp $< $(OBJDIR)')
 		if prj.language == "C" then
-			_p('\t$(SILENT) $(CC) $(CFLAGS) -o $@ -c $<')
+			_p('\t$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"')
 		else
-			_p('\t$(SILENT) $(CXX) $(CXXFLAGS) -o $@ -c $<')
+			_p('\t$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"')
 		end
 		_p('endif')
 		_p('')

tests/actions/make/test_make_pch.lua

@@ -70,7 +70,7 @@ ifneq (,$(PCH))
 $(GCH): $(PCH)
 	@echo $(notdir $<)
 	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CXX) $(CXXFLAGS) -o $@ -c $<
+	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 endif
 		]]
 	end
@@ -85,7 +85,7 @@ ifneq (,$(PCH))
 $(GCH): $(PCH)
 	@echo $(notdir $<)
 	-$(SILENT) cp $< $(OBJDIR)
-	$(SILENT) $(CC) $(CFLAGS) -o $@ -c $<
+	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
 endif
 		]]
 	end