[vlc-devel] commit: fixed package-macosx-plugin in case top_srcdir != top_buildir and switched image format to UDBZ, too ( Felix Paul Kühne )

git version control git at videolan.org
Sun Jun 7 20:42:41 CEST 2009


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Jun  7 20:42:37 2009 +0200| [4b36ca62fcc40bfa4faba078c6556fe35707136e] | committer: Felix Paul Kühne 

fixed package-macosx-plugin in case top_srcdir != top_buildir and switched image format to UDBZ, too

NOTE that creating the plugin bundle is still horribly broken in the former case

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4b36ca62fcc40bfa4faba078c6556fe35707136e
---

 Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 551285d..5de28ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1181,8 +1181,8 @@ if BUILD_MOZILLA
 	fi; \
 	$${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
 	-f "$(top_builddir)/macosx-plugin-instdata" \
-	-i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \
-	-d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true
+	-i "$(top_builddir)/extras/package/macosx/plugin/InstallerInfo.plist" \
+	-d "$(top_srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true
 	rm -rf "$(top_builddir)/macosx-plugin-instdata/"
 
 # Create disk image 
@@ -1191,7 +1191,7 @@ if BUILD_MOZILLA
 	mkdir -p "$(top_builddir)/vlc-plugin-$(VERSION)/"
 	mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-$(VERSION)/"
 	hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \
-	  "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDZO \
+	  "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDBZ \
 	  -scrub -imagekey zlib-level=9
 	echo "Disk image creation completed:"
 	rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)"




More information about the vlc-devel mailing list