contrib: gpg-error: skip automake

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 120a0a3b6ec4c871d446a33ec6bd16c415233403..92cfe099f102934500a12f93617dea7abf600a9d 100644 (file)
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -15,7 +15,6 @@ endif
        $(MOVE)
 
 .gpg-error: libgpg-error
-       cd $< && automake
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-nls --disable-shared --disable-languages
        cd $< && $(MAKE) install
        touch $@

diff --git a/contrib/src/gpg-error/windres-make.patch b/contrib/src/gpg-error/windres-make.patch
index b26387100d1b0153d82a7e27460adda817ca4ffc..53ddbecf1bc1458d624e04d20d91fc5a9c095b2a 100644 (file)
--- a/contrib/src/gpg-error/windres-make.patch
+++ b/contrib/src/gpg-error/windres-make.patch
@@ -9,3 +9,14 @@
  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