[vlc-commits] build-package: remove hacks

[Felix Paul Kühne]

npapi-vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Nov 22 15:29:40 2013 +0100| [70e7a27c1f5c25780c382ed576ff3226b65a4a5e] | committer: Felix Paul Kühne

build-package: remove hacks

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=70e7a27c1f5c25780c382ed576ff3226b65a4a5e
---

 extras/macosx/build-package.sh |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/extras/macosx/build-package.sh b/extras/macosx/build-package.sh
index 67d49e3..f108ec7 100644
--- a/extras/macosx/build-package.sh
+++ b/extras/macosx/build-package.sh
@@ -13,11 +13,8 @@ if test "${ACTION}" = "release-makefile"; then
     echo "running build-package.sh in release-makefile mode"
 
     FULL_PRODUCT_NAME="${PRODUCT}"
-    if [ "$FULL_PRODUCT_NAME" = "VLC-Plugin.plugin" ] ; then
-        TARGET_BUILD_DIR="${src_dir}"
-    else
-        TARGET_BUILD_DIR="${build_dir}"
-    fi
+    TARGET_BUILD_DIR="${build_dir}"
+
     CONTENTS_FOLDER_PATH="${FULL_PRODUCT_NAME}/Contents/MacOS"
     VLC_BUILD_DIR="${build_dir}"
     VLC_SRC_DIR="${src_dir}"
@@ -234,12 +231,7 @@ fi
 
 ##########################
 # Hack for VLC.app
-if [ "$FULL_PRODUCT_NAME" = "VLC-Plugin.plugin" ] ; then
-    # install Safari webplugin
-    vlc_install "${src_dir}/${prefix}" "npvlc.${suffix}" "${target}" "lib" "@loader_path/lib"
-    mv ${target}/npvlc.${suffix} "${target}/VLC Plugin"
-    chmod +x "${target}/VLC Plugin"
-else
+if [ "$FULL_PRODUCT_NAME" != "VLC-Plugin.plugin" ] ; then
     vlc_install "bin/${prefix}" "vlc" "${target}/bin" "bin" "@loader_path/../lib"
 fi