Skip to content

Commit

Permalink
contrib: Don't polute root Makefile for autoconf package related stuff.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pdherbemont committed Nov 2, 2010
1 parent bc28b88 commit ae14df5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 0 additions & 6 deletions extras/contrib/contrib.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions extras/contrib/src/contrib-src.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ae14df5

Please sign in to comment.