Now correctly creates a self-contained application

1 files changed, 19 insertions, 8 deletions

diff --git a/mac/make-package b/mac/make-package
index 7b5c189934a..81ea44915fb 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -85,7 +85,7 @@ do
        with_app=no ;;
     --without-full-dist | -without-full-dist | -no-full-dist | -no-full)
        full_dist=no ;;
-    -self-contained | --with-self-contained-app | -sc)
+    --self-contained | -self-contained | --with-self-contained-app | -sc)
        self_contained=yes ;;
     -app-symlink | --app-symlink | -symlink | --symlink | --asl)
        app_symlink=yes ;;
@@ -95,7 +95,8 @@ do
        config_options="$config_options `expr "x$1" : 'x[^,]*,\(.*\)'`" ;;
     -M,* | -m,*)
        make_options="$make_options `expr "x$1" : 'x[^,]*,\(.*\)'`" ;;
-       
+    *)
+       display_usage=yes ;;
   esac
   shift
 done
@@ -258,25 +259,35 @@ fi
 if test "$with_app" == "yes"; then
   echo "Creating Emacs.app application"
   tempappdir=${tempparentfull}${appsdir}
+  tempemapp=${tempappdir}/${emapp}/Contents/MacOS/Emacs
   mkdir ${tempappdir}
 
   ## Copy Emacs application
   cp -r Emacs.app ${tempappdir}
   ## Delete any CVS files
   find ${tempappdir} -name "CVS" -type d -execdir rm -rf {} \;
+
   ## Have application be a symlink to ${prefix}/bin/emacs
   if test "$app_symlink" == "yes"; then
     echo "Creating application symlink"
-    tempemapp=${tempappdir}/${emapp}/Contents/MacOS/Emacs
     rm ${tempemapp}
-    if test "$self_contained" = "yes"; then
-        ln -s ../../Contents/Resources/bin/${emacsname} ${tempemapp}
-    else
-        ln -s ${prefix}/bin/${emacsname} ${tempemapp}
-    fi
+    ln -s ${prefix}/bin/${emacsname} ${tempemapp}
   fi
 fi
 
+if test "$self_contained" = "yes"; then
+    # Move shared files down to Resources directory
+    mv $installprefix/share/emacs/$version/* $installprefix
+    rm -rf $installprefix/share
+    # These directories might remain in Resources
+    mv $installprefix/bin $installprefix/../MacOS/bin
+    mv $installprefix/libexec $installprefix/../MacOS/libexec
+    # Make the application binary a hard link
+    rm $installprefix/../MacOS/Emacs
+    ln $installprefix/../MacOS/bin/emacs $installprefix/../MacOS/Emacs
+fi
+
+
 # Remove unnecessary .el files
 #if test "$full_dist" = no; then
 #fi