avformat: Support for AVChapters.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 184326be7b3118fe69d352063809ccf72a5b0340..7b369061838049d7c271fc2f9d308194a166659e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -413,7 +413,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` && \
+       REVISION=`git describe` && \
        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/
@@ -453,7 +453,6 @@ VLC-release.app: vlc
            simple_prefs.h \
            simple_prefs.m \
            vout.h \
-           voutqt.m \
            voutgl.m \
            wizard.h \
            wizard.m \
@@ -480,6 +479,10 @@ VLC-release.app: vlc
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
        PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua
+       for i in $(srcdir)/share/lua/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/`basename $${i}` ; \
+       done ; \
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
@@ -562,6 +565,8 @@ VLC-release.app: vlc
              $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
        done
        printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo
+       find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete;
+       find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete;
        find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
        find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
@@ -575,7 +580,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` && \
+       REVISION=`git describe` && \
        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/
@@ -615,7 +620,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
            simple_prefs.h \
            simple_prefs.m \
            vout.h \
-           voutqt.m \
            voutgl.m \
            wizard.h \
            wizard.m \
@@ -776,6 +780,10 @@ endif
 
 if BUILD_LUA
 #Lua Scripts
+       $(INSTALL) -d $(win32_lua_destdir)
+       for i in $(srcdir)/share/lua/*.* ; do \
+         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
+       done
        $(INSTALL) -d $(win32_lua_destdir)/playlist
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
          $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
@@ -840,7 +848,7 @@ if BUILD_SKINS
        for i in $(srcdir)/share/skins2/fonts/*.*; do \
          cp -- "$$i" $(win32_destdir)/skins/fonts/ || true ; \
        done
-       for i in $(srcdir)/share/skins2/*.*; do \
+       for i in $(top_builddir)/share/skins2/*.*; do \
          cp -- "$$i" $(win32_destdir)/skins/ || true ; \
        done
 endif