X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=f9c77eeff92e7cca12334980850d827e57e3acc8;hb=7bc6040d182732f888a916fd48c8555a4f020f09;hp=49e38dc7bb40b3a61458e6fc6e258e61d05ea5b7;hpb=8442f8adddbb55bd66a9155512fef5c0ab70ad4c;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 49e38dc7bb..f9c77eeff9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 ; \
@@ -989,17 +992,17 @@ package-macosx:
 	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 ;
+	  -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}" ;