From: Pierre d'Herbemont Date: Wed, 14 Oct 2009 21:23:04 +0000 (+0200) Subject: am: Don't fail to build Mac OS X target if there is no git. X-Git-Tag: 1.1.0-ff~2894 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0ce8daf7e8e0e3c0324ab4ab5162998235909363;p=vlc am: Don't fail to build Mac OS X target if there is no git. --- diff --git a/Makefile.am b/Makefile.am index 4d16422741..3d9bb5078b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -432,7 +432,7 @@ VLC-release.app: vlc for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done - REVISION=`git describe --always` && \ + REVISION=`(git describe --always || echo exported)` && \ cat $(top_builddir)/extras/package/macosx/Info.plist | \ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/ @@ -585,7 +585,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done - REVISION=`git describe --always` && \ + REVISION=`(git describe --always || echo exported)` && \ cat $(top_builddir)/extras/package/macosx/Info.plist | \ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/