Commit 7f43c5cb authored by Ming Hu's avatar Ming Hu Committed by 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: default avatarRafaël Carré <funman@videolan.org>
parent 57553f39
...@@ -310,7 +310,7 @@ APPLY = (cd $(UNPACK_DIR) && patch -p1) < ...@@ -310,7 +310,7 @@ APPLY = (cd $(UNPACK_DIR) && patch -p1) <
pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1)) pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1))
MOVE = mv $(UNPACK_DIR) $@ && touch $@ 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 \ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
if test -f "$${dir}/config.sub" -a -f "$${dir}/config.guess"; then \ if test -f "$${dir}/config.sub" -a -f "$${dir}/config.guess"; then \
cp "$${dir}/config.sub" "$${dir}/config.guess" $(UNPACK_DIR); \ cp "$${dir}/config.sub" "$${dir}/config.guess" $(UNPACK_DIR); \
......
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