[vlc-devel] commit: Fix package-macosx-plugin target on MacOS X 10.5 (Leopard). ( Felix Paul Kühne )

[git version control]

vlc | branch: 0.9-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Tue Nov 11 19:47:05 2008 +0100| [31932ea8ff1c03f12f23bf383d5c978a943b7347] | committer: Felix Paul Kühne 

Fix package-macosx-plugin target on MacOS X 10.5 (Leopard).

forward-port [578af5df020a05e7deb7f4b0fdf5b6c5d402814e]

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

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

 Makefile.am |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9868e79..d44dfb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1090,7 +1090,14 @@ if BUILD_MOZILLA
 	mkdir -p "$(top_builddir)/macosx-plugin-instdata"
 	cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
 	rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
-	PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+	export PACKAGEMAKER=
+	if test -x /Developer/Tools/packagemaker; then \
+	   export PACKAGEMAKER=/Developer/Tools/packagemaker; \
+	fi; \
+	if test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then \
+	   export PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; \
+	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