[vlc-devel] [PATCH 11/22] contrib: patch the Makefile.am rather than Makefile.in

[Steve Lhomme]

On Wed, Aug 5, 2015 at 5:51 PM, Rémi Denis-Courmont <remi at remlab.net> wrote:
> Le vendredi 31 juillet 2015, 16:54:55 Steve Lhomme a écrit :
>> ---
>>  contrib/src/dvbpsi/dvbpsi-noexamples.patch | 15 ++++++++-------
>>  1 file changed, 8 insertions(+), 7 deletions(-)
>>
>> diff --git a/contrib/src/dvbpsi/dvbpsi-noexamples.patch
>> b/contrib/src/dvbpsi/dvbpsi-noexamples.patch index d400474..13ac49b 100644
>> --- a/contrib/src/dvbpsi/dvbpsi-noexamples.patch
>> +++ b/contrib/src/dvbpsi/dvbpsi-noexamples.patch
>> @@ -1,11 +1,12 @@
>> ---- libdvbpsi/Makefile.in    2013-11-10 14:17:53.000000000 +0200
>> -+++ dvbpsi.fix/Makefile.in   2014-02-15 17:25:31.184012648 +0200
>> -@@ -349,7 +349,7 @@
>> - top_builddir = @top_builddir@
>> - top_srcdir = @top_srcdir@
>> - ACLOCAL_AMFLAGS = -I m4
>> +--- libdvbpsi/Makefile.am 2014-04-16 09:22:14.000000000 +0200
>> ++++ libdvbpsi/Makefile.am.new     2015-07-30 09:28:59.436508400 +0200
>> +@@ -2,7 +2,7 @@
>> +
>> + ACLOCAL_AMFLAGS=-I m4
>> +
>>  -SUBDIRS = src examples misc
>>  +SUBDIRS = src
>>   DIST_SUBDIRS = $(SUBDIRS) doc wince
>> +
>>   EXTRA_DIST = libdvbpsi.spec libdvbpsi.spec.in libdvbpsi.pc.in bootstrap
>> - pkgconfigdir = $(libdir)/pkgconfig
>> +
>
> You need to run RECONF if you change Makefile.am.

automake was actually run in my configuration, see this log:
http://pastebin.com/f3Pc84NJ
we were modifying configure.ac, but we don't need to anymore so
discard this patch.


> --
> Rémi Denis-Courmont
> http://www.remlab.net/
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel