macosx: fix packaging Safari and Firefox plugin.

diff --git a/Makefile.am b/Makefile.am
index 378b34affe9e17f18e6c67c49b2ebb97945f2209..de908dd5fd88faa3b9251d60f58bc32cebebb521 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -575,7 +575,7 @@ VLC-release.app: vlc
        find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
 # This is just for development purposes. 
-# The resulting VLC.app will only in this tree.
+# The resulting VLC.app will only run in this tree.
 VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
        (cd src && make install)
        rm -Rf $(top_builddir)/tmp

diff --git a/projects/macosx/framework/Pre-Compile.sh b/projects/macosx/framework/Pre-Compile.sh
index 48e4a6e66caba01560f819487d2e07fca8c3cacf..6a23dc2005ee86b1d6afc2c4b20ec9f8b527fd58 100644 (file)
--- a/projects/macosx/framework/Pre-Compile.sh
+++ b/projects/macosx/framework/Pre-Compile.sh
@@ -80,7 +80,7 @@ if test "${ACTION}" = "build"; then
             for linked_lib in `otool -L ${lib_dest}  | grep '(' | sed 's/\((.*)\)//'`; do
                 local name=`basename ${linked_lib}`
                 case "${linked_lib}" in
-                    */vlc_build_dir/*  | *vlc* | */extras/contrib/lib/*)
+                    */vlc_build_dir/* | */vlc_install_dir/* | *vlc* | */extras/contrib/lib/*)
                         if test -e ${linked_lib}; then
                             install_name_tool -change "$linked_lib" "${lib_install_prefix}/${name}" "${lib_dest}"
                             linked_libs="${linked_libs} ${ref_lib}"
@@ -103,10 +103,11 @@ if test "${ACTION}" = "build"; then
         install_library "${VLC_BUILD_DIR}/bin/${prefix}vlc" "${target}" "bin" "@loader_path/lib"
         mv ${target}/vlc ${target}/VLC
         chmod +x ${target}/VLC
-#    elif [ "$FULL_PRODUCT_NAME" = "VLC-Plugin.plugin" ] ; then
-#        install_library "${VLC_BUILD_DIR}/projects/mozilla/.libs/${prefix}npvlc.${suffix}" "${target}" "bin" "@loader_path/lib"
-#        mv ${target}/npvlc.${suffix} "${target}/VLC\ Plugin"
-#        chmod +x "${target}/VLC\ Plugin"
+    elif [ "$FULL_PRODUCT_NAME" = "VLC-Plugin.plugin" ] ; then
+        # install Safari webplugin
+        install_library "${VLC_BUILD_DIR}/projects/mozilla/${prefix}npvlc.${suffix}" "${target}" "library" "@loader_path/lib"
+        mv ${target}/npvlc.${suffix} "${target}/VLC Plugin"
+        chmod +x "${target}/VLC Plugin"
     fi
 
     ##########################
@@ -152,7 +153,9 @@ if test "${ACTION}" = "build"; then
         esac
     done
 
-    install_library "${VLC_BUILD_DIR}/src/${prefix}libvlc.dylib" ${target_lib} "library"
+    #install_library "${VLC_BUILD_DIR}/src/${prefix}libvlc.dylib" ${target_lib} "library"
+    install_library "${VLC_BUILD_DIR}/src/${prefix}libvlc.2.dylib" ${target_lib} "library"
+    install_library "${VLC_BUILD_DIR}/src/${prefix}libvlccore.dylib" ${target_lib} "library"
 
     ##########################
     # Build the share folder

diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am
index 0ee94fe155d42aa035f9651970ece32747cd9c9f..111d92e0c283c784d3082edc254fee758640fb42 100644 (file)
--- a/projects/mozilla/Makefile.am
+++ b/projects/mozilla/Makefile.am
@@ -107,10 +107,6 @@ VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
        $(INSTALL) -d "VLC-Plugin.plugin/Contents/MacOS/lib"
        $(INSTALL) -d "VLC-Plugin.plugin/Contents/Resources"
        ACTION="release-makefile" PRODUCT="VLC-Plugin.plugin" src_dir=$(srcdir) build_dir=$(top_builddir) sh "$(top_srcdir)/projects/macosx/framework/Pre-Compile.sh"
-       $(INSTALL) .libs/npvlc.dylib "VLC-Plugin.plugin/Contents/MacOS/VLC Plugin"
-       dylib="VLC-Plugin.plugin/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH);
-       $(INSTALL) .libs/npvlc.dylib "VLC-Plugin.plugin/Contents/MacOS/lib"
-       dylib="VLC-Plugin.plugin/Contents/MacOS/lib/npvlc.dylib"; $(FIXEXECPATH);
        $(INSTALL) npvlc.rsrc "VLC-Plugin.plugin/Contents/Resources/VLC Plugin.rsrc"
        $(INSTALL) "$(top_builddir)/extras/package/macosx/plugin/Info.plist" "VLC-Plugin.plugin/Contents/Info.plist"
        mv "VLC-Plugin.plugin" "VLC Plugin.plugin"