Fixing win32 build

Makefile.in

@@ -301,7 +301,7 @@ install-macos-application: \
 		$(DESTDIR)$(bindir)/$(PRODUCT_NAME)@EXEEXT@
 
 install-windows-application: \
-	branding/$(PRODUCT_NAME).png \
+	$(srcdir)/branding/$(PRODUCT_NAME).png \
 	strip
 
 	@$(MKDIR) \
@@ -315,11 +315,11 @@ install-windows-application: \
 		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)
 
 	@$(INSTALL_DATA) \
-		branding/$(PRODUCT_NAME).png \
+		$(srcdir)/branding/$(PRODUCT_NAME).png \
 		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png
 
 	@$(INSTALL_DATA) \
-		CHANGELOG \
+		$(srcdir)/CHANGELOG \
 		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME).changes
 
 install-icons:

branding/Makefile.in

@@ -24,9 +24,9 @@ APPLICATION_ID=@APPLICATION_ID@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+srcdir=@srcdir@
 datarootdir=@datarootdir@
 bindir=@bindir@
-srcdir=@srcdir@
 
 BUILDDIR=@BUILDDIR@
 BINDIR=$(BUILDDIR)/.bin
@@ -156,7 +156,7 @@ install-windows: \
 	@$(MKDIR) $(DESTDIR)$(bindir)
 
 	@$(INSTALL_DATA) \
-		$(PRODUCT_NAME).ico \
+		$(srcdir)/$(PRODUCT_NAME).ico \
 		$(DESTDIR)$(bindir)/$(PRODUCT_NAME).ico
 
 

src/include/config.h.in

@@ -24,12 +24,12 @@
 /* do we have malloc.h? */
 #undef HAVE_MALLOC_H
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -105,7 +105,9 @@
 /* The schema path */
 #undef PRODUCT_PATH
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Version number of package */