[vlc-commits] contrib: gpg-error: skip automake

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Nov 22 23:23:59 2011 -0500| [a16ccb7c096b784d0fde169759a71ff538e3fe90] | committer: Rafaël Carré

contrib: gpg-error: skip automake

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a16ccb7c096b784d0fde169759a71ff538e3fe90
---

 contrib/src/gpg-error/rules.mak          |    1 -
 contrib/src/gpg-error/windres-make.patch |   11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 120a0a3..92cfe09 100644
--- 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 b263871..53ddbec 100644
--- 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 at arch_sources = 
+ @HAVE_W32_SYSTEM_TRUE at arch_sources = w32-gettext.c
+ @HAVE_W32_SYSTEM_TRUE at RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- at HAVE_W32_SYSTEM_TRUE@            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
++ at HAVE_W32_SYSTEM_TRUE@            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS)
+ 
+ @HAVE_W32_SYSTEM_TRUE at LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
+ @HAVE_W32_SYSTEM_TRUE at SUFFIXES = .rc .lo