Commit 2c4fdc1b authored by Pierre Ynard's avatar Pierre Ynard

contribs: fix theora patching

Run ./autogen.sh instead of autoconf, so that we don't need to patch
Makefile.in too (which was broken)
parent e123d847
...@@ -765,7 +765,7 @@ endif ...@@ -765,7 +765,7 @@ endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
patch -p0 < Patches/theora-doc.patch patch -p0 < Patches/theora-doc.patch
endif endif
(cd $@; autoconf) (cd $@; ./autogen.sh)
THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples
ifdef HAVE_WIN32 ifdef HAVE_WIN32
......
...@@ -39,16 +39,3 @@ ...@@ -39,16 +39,3 @@
# we include the whole debian/ dir in EXTRA_DIST because there's a problem # we include the whole debian/ dir in EXTRA_DIST because there's a problem
--- libtheora/Makefile.in 2008-10-07 10:21:32.000000000 +0200
+++ libtheora.new/Makefile.in 2008-10-07 10:21:05.000000000 +0200
@@ -245,7 +245,9 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
@THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR =
@THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples
-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
+@THEORA_ENABLE_DOCS_FALSE@DOC_DIR=
+@THEORA_ENABLE_DOCS_TRUE@DOC_DIR=doc
+SUBDIRS = lib include ${DOC_DIR} tests m4 $(EXAMPLES_DIR)
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment