[vlc-commits] commit: contrib: Don' t polute root Makefile for autoconf package related stuff. (Pierre d' Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Tue Nov  2 21:58:10 2010 +0100| [ae14df5aa3f393c06eeed2c72065c9b531421cf6] | committer: Pierre d'Herbemont 

contrib: Don't polute root Makefile for autoconf package related stuff.

This fix unbreaks those who don't build autoconf.

Note, I have absolutely no idea why this is needed. This doesn't feel right anyhow.

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

 extras/contrib/contrib.mak         |    6 ------
 extras/contrib/src/contrib-src.mak |    4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index ef99bae..5d448b4 100644
--- a/extras/contrib/contrib.mak
+++ b/extras/contrib/contrib.mak
@@ -38,12 +38,6 @@ 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)
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index ecd534c..d0c1a8d 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -311,6 +311,10 @@ 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