From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Fri, 21 May 2010 20:21:51 +0000 (+0200)
Subject: Contrib: vpx small fix
X-Git-Tag: 1.2.0-pre1~6564
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ce9519fbde306ec40adb6a8c37d6c556646d4257;p=vlc

Contrib: vpx small fix
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9441a41498..c0f6000218 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -919,9 +919,7 @@ libvpx-$(VPX_VERSION).tar.bz2:
 
 vpx: libvpx-$(VPX_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-ifneq ($(HOST),$(BUILD))
 	patch -p0 < Patches/libvpx-cross.patch
-endif
 
 ifdef HAVE_WIN32
 VPX_TARGET=x86-win32-gcc
@@ -932,6 +930,7 @@ endif
 .vpx: vpx
 	(cd $<; ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && XCC=$(CC) XNM=$(NM) XSTRIP=$(STRIP) make && make install)
 	(cd $<; cp vp8/*.h vpx_codec/*.h vpx_port/*.h $(PREFIX)/include) # Of course, why the hell would one expect it to be listed or in make install?
+	rm $(PREFIX)/include/config.h
 	(cd $<; $(RANLIB) libvpx.a && cp libvpx.a $(PREFIX)/lib) # Of course, why the hell would one expect it to be listed or in make install?
 	touch $@