[vlc-devel] [vlc-commits] commit: Revert "contrib: Don' t polute root Makefile for autoconf package related stuff." ( Rafaël Carré )

[Pierre d'Herbemont]

On Wed, Nov 3, 2010 at 3:23 AM,  <git at videolan.org> wrote:
> vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Wed Nov  3 03:20:17 2010 +0100| [3ef9ecfb2fd932158a50e44f62a446e42b67cc9f] | committer: Rafaël Carré
>
> Revert "contrib: Don't polute root Makefile for autoconf package related stuff."
>
> This reverts commit ae14df5aa3f393c06eeed2c72065c9b531421cf6.
>
> [d85d6537739f9] explains why it is needed

Understood, sorry for the breakage.

Yet, this is does not work if aclocal is empty. Also this is somewhat
suspicious :-)

Pierre.

>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3ef9ecfb2fd932158a50e44f62a446e42b67cc9f
> ---
>
>  extras/contrib/contrib.mak         |    7 +++++++
>  extras/contrib/src/contrib-src.mak |    4 ----
>  2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
> index c6484e9..ef99bae 100644
> --- a/extras/contrib/contrib.mak
> +++ b/extras/contrib/contrib.mak
> @@ -38,6 +38,13 @@ all: $(TARGETALL)
>
>  using-src:
>        $(MAKE) -C build-src
> +# Copy aclocal files
> +# This is necessary for --missing aclocal to succeed after a
> +# configure.ac/Makefile.am change in the vlc root dir
> +       if test -e "$(PREFIX)/share/aclocal"; then \
> +           cp -Rf $(PREFIX)/share/aclocal/* $(VLCROOTDIR)/m4; \
> +       fi
> +
>  ifdef HAVE_DARWIN_10
>        (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
>  endif
> diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
> index e5b1d90..b0bca4d 100644
> --- a/extras/contrib/src/contrib-src.mak
> +++ b/extras/contrib/src/contrib-src.mak
> @@ -311,10 +311,6 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2
>
>  .autoconf: autoconf
>        (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
> -# Copy aclocal files
> -# This is necessary for --missing aclocal to succeed after a
> -# configure.ac/Makefile.am change in the vlc root dir
> -       cp -Rf $(PREFIX)/share/aclocal/* $(VLCROOTDIR)/m4
>        touch $@
>
>  CLEAN_FILE += .autoconf
>
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> http://mailman.videolan.org/listinfo/vlc-commits
>