diff -ur jpeg.org/simd/Makefile.in jpeg/simd/Makefile.in
--- jpeg.org/simd/Makefile.in	2014-11-14 21:55:21.557802955 +0100
+++ jpeg/simd/Makefile.in	2014-11-14 21:57:16.845804312 +0100
@@ -583,8 +583,9 @@
 .asm.lo:
 	$(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@
 
-jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h
-	$(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@
+jsimdcfg.inc: $(top_srcdir)/win/jsimdcfg.inc
+	cp $< $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- jpeg-turbo/configure.orig	2015-02-21 19:44:23.639600000 +0100
+++ jpeg-turbo/configure	2015-02-21 19:44:33.764000000 +0100
@@ -1847,7 +1847,7 @@
 else
   cat >conftest.make <<\_ACEOF
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo 'ac_maketemp=$(MAKE)'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
