Ticket #20272: Makefile.am.diff

File Makefile.am.diff, 1.4 KB (added by max@…, 15 years ago)

Makefile.am.diff needs to be updated too, else it fails to apply

  • Makefile.am

    old new  
    411411vlc$(EXEEXT):
    412412        ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
    413413
    414 if HAVE_DARWIN
    415 if BUILD_VLC
    416 # Create the MacOS X app
    417 noinst_DATA = VLC.app
    418 endif
    419 endif
    420 
    421414# VLC-release.app for packaging and giving it to your friends
    422415# use package-macosx to get a nice dmg
    423416VLC-release.app: vlc
    … …  
    428421        for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
    429422          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
    430423        done
    431         REVISION=`git describe --always` && \
     424        REVISION="$(VERISON_REVISION)" && \
    432425        cat $(top_builddir)/extras/package/macosx/Info.plist | \
    433426        sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
    434427        cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
    … …  
    582575        for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
    583576          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
    584577        done
    585         REVISION=`git describe --always` && \
     578        REVISION="$(VERSION_REVISION)" && \
    586579        cat $(top_builddir)/extras/package/macosx/Info.plist | \
    587580        sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
    588581        cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/