osx-proj: fix ogg format descriptions and add media types (refs #1279). Patch by...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1c590068e5e8dbe1710626068b533f17dbbe402f..23a82c2df34aeec1638066585605ba6ed009c511 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -351,7 +351,7 @@ VLC-release.app: vlc
          echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
          false; \
        else \
-         echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
+         echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
        fi
        rm -Rf $(top_builddir)/VLC-release.app
        cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
@@ -467,6 +467,7 @@ VLC-release.app: vlc
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests
+       $(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
        for i in $(srcdir)/share/http-lua/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
        done ; \
@@ -499,6 +500,8 @@ VLC-release.app: vlc
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests
+       $(INSTALL) -m 644 $(srcdir)/share/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/.hosts
+       $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts
        for i in $(srcdir)/share/http/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
        done ; \
@@ -987,7 +990,7 @@ package-macosx:
 # Create disk image 
        echo "Creating disk image" ;
        rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
-       hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
+       hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \
          "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \
          -scrub -imagekey zlib-level=9 ;