Ticket #25431: patch-Makefile.am.diff

Makefile.am

@@ -426 +426 @@
 vlc$(EXEEXT):
         $(AM_V_GEN)ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
 
-if HAVE_DARWIN
-if BUILD_MACOSX_VLC_APP
-# Create the MacOS X app
-noinst_DATA = VLC.app
-endif
-endif
-
 silentstd = $(silentstd_$(V))
 silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY))
 silentstd_0 = 2>&1 >/dev/null
@@ -447 +440 @@
         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 --git-dir=$(srcdir)/.git describe --always || echo exported)` && \
+        REVISION=$(VERSION_REVISION) && \
         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/
@@ -600 +593 @@
         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 --git-dir=$(srcdir)/.git describe --always || echo exported)` && \
+        REVISION=$(VERSION_REVISION) && \
         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/