[vlc-commits] commit: contrib: Fix build when there is no autoconf. (Pierre d'Herbemont )

git at videolan.org git at videolan.org
Sun Oct 31 18:47:41 CET 2010


vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Sun Oct 31 18:45:10 2010 +0100| [78c576d876202cb9cb4d644c2b1b0d1af3f6f0e5] | committer: Pierre d'Herbemont 

contrib: Fix build when there is no autoconf.

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

 extras/contrib/contrib.mak |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index 3a2fed6..ef99bae 100644
--- a/extras/contrib/contrib.mak
+++ b/extras/contrib/contrib.mak
@@ -38,10 +38,12 @@ 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
-	cp -R $(PREFIX)/share/aclocal/* $(VLCROOTDIR)/m4
+# 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)



More information about the vlc-commits mailing list