[vlc-devel] commit: OSX: use correctly git even when building out of srcdir ( Rafaël Carré )

git version control git at videolan.org
Fri Nov 6 18:33:56 CET 2009


vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Fri Nov  6 18:32:16 2009 +0100| [e22a0fc342d12f5a3152003e886150d6a8e4668c] | committer: Rafaël Carré 

OSX: use correctly git even when building out of srcdir

Note : Info.plist.in doesn't seem to contain "REVISION" string
Is that git command now useless?

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

 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5c7a41c..0f1146d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -431,7 +431,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 || echo exported)` && \
+	REVISION=`(git --git-dir=$(srcdir)/.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/
@@ -584,7 +584,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 || echo exported)` && \
+	REVISION=`(git --git-dir=$(srcdir)/.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/




More information about the vlc-devel mailing list