--- libgpg-error/src/Makefile.am	2010-04-14 11:16:44.000000000 +0200
+++ libgpg-error.new/src/Makefile.am	2010-08-09 11:21:56.000000000 +0200
@@ -60,7 +60,7 @@
 arch_sources = w32-gettext.c
 
 RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
+            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS)
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
 
 SUFFIXES = .rc .lo
--- libgpg-error/src/Makefile.in.orig	2011-11-22 23:23:14.450340031 -0500
+++ libgpg-error/src/Makefile.in	2011-11-22 23:23:20.650370779 -0500
@@ -306,7 +306,7 @@
 @HAVE_W32_SYSTEM_FALSE@arch_sources = 
 @HAVE_W32_SYSTEM_TRUE@arch_sources = w32-gettext.c
 @HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@HAVE_W32_SYSTEM_TRUE@            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
+@HAVE_W32_SYSTEM_TRUE@            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS)
 
 @HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
 @HAVE_W32_SYSTEM_TRUE@SUFFIXES = .rc .lo