[vlc-commits] contrib: fix build fail on Fedora 17

[Ming Hu]

vlc | branch: master | Ming Hu <tewilove at gmail.com> | Mon Jun  4 15:07:31 2012 +0800| [7f43c5cb6001d6f9e8a7fd76b0baed71f7b1888c] | committer: Rafaël Carré

contrib: fix build fail on Fedora 17

In Fedora 17 which automake returns /bin/automake, this breaks current automake data directory detection.
This patch tries to guess it from PATH.

Signed-off-by: Rafaël Carré <funman at videolan.org>

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

 contrib/src/main.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 9ac80d2..5250c7f 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -310,7 +310,7 @@ APPLY = (cd $(UNPACK_DIR) && patch -p1) <
 pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1))
 MOVE = mv $(UNPACK_DIR) $@ && touch $@
 
-AUTOMAKE_DATA_DIRS=$(abspath $(dir $(shell which automake))/../share/automake*)
+AUTOMAKE_DATA_DIRS=$(foreach n,$(foreach n,$(subst :, ,$(shell echo $$PATH)),$(abspath $(n)/../share)),$(wildcard $(n)/automake*))
 UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
 		if test -f "$${dir}/config.sub" -a -f "$${dir}/config.guess"; then \
 			cp "$${dir}/config.sub" "$${dir}/config.guess" $(UNPACK_DIR); \