Mercurial > emacs
changeset 48749:94d8efd47824
Now correctly creates a self-contained application
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Sun, 08 Dec 2002 18:29:36 +0000 |
| parents | 0f5f21cee53f |
| children | c554816151b2 |
| files | mac/make-package |
| diffstat | 1 files changed, 19 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mac/make-package Sun Dec 08 18:29:14 2002 +0000 +++ b/mac/make-package Sun Dec 08 18:29:36 2002 +0000 @@ -85,7 +85,7 @@ 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 @@ 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 @@ 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