[vlc-commits] extras/tools: set AUTOCONF variable so automake can find it
Rafaël Carré
git at videolan.org
Sat Nov 26 20:12:06 CET 2011
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Nov 26 14:11:27 2011 -0500| [c1cdd9154cb857a9886d28e9deb8d27b41c1f8e1] | committer: Rafaël Carré
extras/tools: set AUTOCONF variable so automake can find it
use $(AUTOCONF) to make pkg-config, add dependancy on autoconf
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1cdd9154cb857a9886d28e9deb8d27b41c1f8e1
---
extras/tools/tools.mak | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 68267cb..6ea4169 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -8,6 +8,9 @@ include packages.mak
# common rules
#
+AUTOCONF=$(PREFIX)/bin/autoconf
+export AUTOCONF
+
ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),)
download = curl -f -L -- "$(1)" > "$@"
else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),)
@@ -159,10 +162,10 @@ DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz
pkg-config-$(PKGCFG_VERSION).tar.gz:
$(download) $(PKGCFG_URL)
-pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
+pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz .autoconf
$(UNPACK)
$(MOVE)
- (cd $@; autoconf)
+ (cd $@; $(AUTOCONF))
.pkg-config: pkgconfig
(cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
More information about the vlc-commits
mailing list