Mercurial > emacs
diff mac/make-package @ 49091:4d9ad5d4f2d4
* INSTALL: Added documentation about --enable-carbon-app and
changed documentation concerning Emacs.app location
Removed some of the documentation about make-package that isn't
needed
Changed comment about requiring root permission to install to
saying that it might be necessary depending on where you install
Refered to /usr caveat in more places
* make-package (make_options): Use new carbon_appdir option to
specify directory to install Application and lets the makefile
install
author | Steven Tamm <steventamm@mac.com> |
---|---|
date | Tue, 07 Jan 2003 05:50:36 +0000 |
parents | 5c4e830c411b |
children | 6f94f884d68e |
line wrap: on
line diff
--- a/mac/make-package Tue Jan 07 05:46:31 2003 +0000 +++ b/mac/make-package Tue Jan 07 05:50:36 2003 +0000 @@ -270,16 +270,23 @@ installprefix=$tempparentfull/$appsdir/$emapp/Contents/Resources fi + +make_options="prefix=${installprefix} $make_options" + +if test "$with_app" = "yes"; then + make_options="carbon_appdir=${tempparentfull}/Applications $make_options" +fi + ## Make bootstrap if .elc files are missing from distribution if [ ! -f ${srcdir}/lisp/abbrev.elc ]; then echo "Required .elc files missing; making bootstrap..." - if ! (cd ${builddir}; make bootstrap prefix=$installprefix $make_options); then + if ! (cd ${builddir}; make bootstrap $make_options); then echo "Make bootstrap failed... Aborting make-package." exit 2 fi fi -if ! (cd ${builddir}; make install prefix=$installprefix $make_options); then +if ! (cd ${builddir}; make install $make_options); then echo "Make failed... Aborting make-package." exit 1 fi @@ -294,10 +301,6 @@ echo "Creating Emacs.app application" tempappdir=${tempparentfull}${appsdir} tempemapp=${tempappdir}/${emapp}/Contents/MacOS/Emacs - mkdir ${tempappdir} - - ## Copy Emacs application - cp -r ${builddir}/mac/Emacs.app ${tempappdir} ## Delete any CVS files find ${tempappdir} -name "CVS" -type d -exec rm -rf {} \;