vlc/vlc-1.2 | branch: master | Rafaël Carré <[email protected]> | Wed Dec 28
11:03:25 2011 -0500| [e86f51352508f3d438dbc8b4da76aa9492d7bdae] | committer:
Jean-Baptiste Kempf
contrib: helper to copy recent config.{guess,sub} from automake
(cherry picked from commit e10f808bfda43a49dff3b49cdac6edc18c3b67db)
Signed-off-by: Jean-Baptiste Kempf <[email protected]>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=e86f51352508f3d438dbc8b4da76aa9492d7bdae
---
contrib/src/main.mak | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index aa58d90..59006b7 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -260,6 +260,14 @@ UNPACK_DIR = $(basename $(basename $(notdir $<)))
APPLY = (cd $(UNPACK_DIR) && patch -p1) <
MOVE = mv $(UNPACK_DIR) $@ && touch $@
+AUTOMAKE_DATA_DIRS=$(abspath $(dir $(shell which automake))/../share/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" $@; \
+ break; \
+ fi; \
+ done
+
RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits
