diff --git a/zenmap/install_scripts/macosx/make-bundle.sh b/zenmap/install_scripts/macosx/make-bundle.sh index de35be594..7f8b25ff1 100755 --- a/zenmap/install_scripts/macosx/make-bundle.sh +++ b/zenmap/install_scripts/macosx/make-bundle.sh @@ -48,14 +48,6 @@ echo "Building using distutils" jhbuild run python setup.py build --executable "/usr/bin/env python" jhbuild run python setup.py install vanilla --prefix "$BASE/Resources" -# This isn't truly necessary, but it allows us to do a simpler check for problems later. -echo "Rewriting linker paths to pass checks" -ESCAPED_LIBBASE=$(echo "$BASE/Resources/" | sed 's/\([\/\\.]\)/\\\1/g') -find $BASE/Resources/lib -type f -name '*.dylib' | while read so; do - dep=$(echo "$so" | sed "s/$ESCAPED_LIBBASE//") - install_name_tool -id "@executable_path/../Resources/$dep" "$so" -done - echo "Renaming main Zenmap executable." mv $BASE/MacOS/$APP_NAME $BASE/MacOS/zenmap.bin # This is a dummy script, so we'll clean it up: diff --git a/zenmap/install_scripts/macosx/zenmap.bundle b/zenmap/install_scripts/macosx/zenmap.bundle index 33bd0a5d8..0843ab242 100644 --- a/zenmap/install_scripts/macosx/zenmap.bundle +++ b/zenmap/install_scripts/macosx/zenmap.bundle @@ -115,9 +115,13 @@ ${prefix}/lib/python2.7/site-packages/glib/*.so ${prefix}/lib/python2.7/site-packages/gobject/*.so ${prefix}/lib/python2.7/site-packages/gtk-2.0/*.so + ${prefix}/lib/python2.7/site-packages/gtk-2.0/gio/*.so ${prefix}/lib/python2.7/site-packages/gtk-2.0/gtk/*.so ${prefix}/lib/python2.7/site-packages/gtkmacintegration/*.so ${prefix}/lib/python2.7/site-packages/gtkosx_application/*.so + ${prefix}/lib/python2.7/