Commit ae14df5a authored by Pierre's avatar Pierre
Browse files

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.
parent bc28b885
...@@ -38,12 +38,6 @@ all: $(TARGETALL) ...@@ -38,12 +38,6 @@ all: $(TARGETALL)
using-src: using-src:
$(MAKE) -C build-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 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) (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
......
...@@ -311,6 +311,10 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2 ...@@ -311,6 +311,10 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2
.autoconf: autoconf .autoconf: autoconf
(cd $<; ./configure --prefix=$(PREFIX) && make && make install) (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 $@ touch $@
CLEAN_FILE += .autoconf CLEAN_FILE += .autoconf
......
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