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

This reverts commit ae14df5a.

[d85d6537] explains why it is needed

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

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