Sync all the other po files.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3d099306b72c41bd9a6126109d4fc167fa6f11ac..f9c77eeff92e7cca12334980850d827e57e3acc8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -351,10 +351,11 @@ 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 $(top_builddir)/tmp/extras
+       cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+       cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
        for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -466,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 ; \
@@ -498,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 ; \
@@ -542,10 +546,11 @@ VLC.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.app
-       cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+       cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+       cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
        for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -966,10 +971,6 @@ package-macosx:
        echo "Create package directory: vlc-${VERSION}/";
        mkdir -p "$(top_builddir)/vlc-${VERSION}/";
 
-# For now, export the framework for third parties, from here
-       (cd $(top_builddir)/extras/MacOSX/Framework && xcodebuild);
-       cp -r $(top_builddir)/extras/MacOSX/Framework/build/Release/VLC.framework $(top_builddir)/vlc-${VERSION}/VLC.framework
-
 # Copy relevant files 
        @if test -e "$(top_builddir)/VLC-release.app/"; then \
          cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
@@ -989,19 +990,19 @@ 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 ;
+         -scrub -imagekey zlib-level=9 -attach ;
 
 # Make sure the root window of the dmg will pop up when the dmg is mounted.
 # Note: We dont mount in /Volumes to be sure we won't collide with an other
 # finder mounted dmg with the same name.
        echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ;
-       mkdir -p $(top_builddir)/vlcmnt ;
-       hdiutil attach -readwrite -noverify -noautoopen "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
+#      mkdir -p $(top_builddir)/vlcmnt ;
+#      hdiutil attach -nokernel -readwrite -noverify -noautoopen -private "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
        bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
        sleep 1 # Make sure operation completes
-       cd "$(srcdir)"
+#      cd "$(srcdir)"
 
 # Unmount the image now
        hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;