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

forward-port [578af5df020a05e7deb7f4b0fdf5b6c5d402814e]

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

diff --git a/Makefile.am b/Makefile.am
index c00082a9a59b5bd43b0594cc82ebe43743a813a8..91b8cf0da2121e6dc170324b897e560ee543d956 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1118,7 +1118,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