]> git.sesse.net Git - vlc/commitdiff
OSX: use correctly git even when building out of srcdir
authorRafaël Carré <rafael.carre@gmail.com>
Fri, 6 Nov 2009 17:32:16 +0000 (18:32 +0100)
committerRafaël Carré <rafael.carre@gmail.com>
Fri, 6 Nov 2009 17:33:32 +0000 (18:33 +0100)
Note : Info.plist.in doesn't seem to contain "REVISION" string
Is that git command now useless?

Makefile.am

index 5c7a41c922ac812b93d97a8c66dc0c515792dab4..0f1146db87d74040c45f0d1007c1c3a6c892126d 100644 (file)
@@ -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/