macosx: fix [24573]

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2b36ebed5c04ca93103e61f2196fa0eaf0f98de5..d12dea31aff8829771db884b12e1d51fd6101819 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -467,7 +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
+       $(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 ; \
@@ -500,8 +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
+       $(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 ; \
@@ -643,7 +643,7 @@ VLC.app: vlc
            ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \
          done ; \
        fi
-       ln -sfn $(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
+       ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -987,26 +987,34 @@ package-macosx:
 # Place a link to the application folder
        ln -s /Applications $(top_builddir)/vlc-${VERSION}/Applications ;
 
-# Create disk image 
+# Create disk image (temporarily taken from the 0.8.6-bugfix branch to provide reliable NBs)
        echo "Creating disk image" ;
        rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
        hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \
-         "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \
-         -scrub -imagekey zlib-level=9 ;
+         "$(top_builddir)/vlc-${VERSION}.dmg" -scrub ;
+       echo "Disk image creation completed:" ;
+       ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;
+
+# Create disk image 
+#      echo "Creating disk image" ;
+#      rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
+#      hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \
+#        "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \
+#        -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}" ;
-       bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
-       sleep 1 # Make sure operation completes
-       cd "$(srcdir)"
+#      echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ;
+#      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)"
 
 # Unmount the image now
-       hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
-       rm -R $(top_builddir)/vlcmnt ;
+#      hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
+#      rm -R $(top_builddir)/vlcmnt ;
 
 # Make sure the image is not writable
 # Note: We can't directly create a read only dmg as we do the bless stuff