Mercurial > emacs
changeset 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 | fc1853b3e3dd |
| children | da6da3a685c2 |
| files | mac/ChangeLog mac/INSTALL mac/make-package |
| diffstat | 3 files changed, 47 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/mac/ChangeLog Tue Jan 07 05:46:31 2003 +0000 +++ b/mac/ChangeLog Tue Jan 07 05:50:36 2003 +0000 @@ -1,3 +1,16 @@ +2003-01-07 Steven Tamm <steventamm@mac.com> + + * 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 + 2003-01-01 Steven Tamm <steventamm@mac.com> * make-package: Now copies License and ReadMe files into the
--- a/mac/INSTALL Tue Jan 07 05:46:31 2003 +0000 +++ b/mac/INSTALL Tue Jan 07 05:50:36 2003 +0000 @@ -19,11 +19,18 @@ commands at the top-level directory after the source distribution is un-tarred. - ./configure + ./configure --enable-carbon-app make make install -The last step must be performed as root. +The last step may fail if you do not have permissions to install. If +you try to install into /usr (with ./configure --prefix=/usr), then you +must install as root using the sudo command. However, it is not +recommended; see the notes section below for more details. + +The --enable-carbon-app specifies that the carbon GUI application +should be installed into /Application. If you want it to install in a +different location, specify --enable-carbon-app=<mydir> If you have X Window installed on your Mac and you are building Emacs to run under Carbon and not X Window, you need to type `./configure @@ -32,22 +39,24 @@ You can type `make bootstrap' instead of `make' to rebuild everything, including byte-compiling the Lisp files. -If you have not installed the GNU texinfo package on your system, the -build will complain that makeinfo cannot be found. Instructions for -installing the GNU texinfo package are given below. Alternatively, -you can type `make -k' instead of `make' and safely ignore the error -messages and use the existing info files. +If you are compiling on Mac OS X versions before 10.2 and have not +installed the GNU texinfo package on your system, the build will +complain that makeinfo cannot be found. Instructions for installing the +GNU texinfo package are given below. Alternatively, you can type `make +-k' instead of `make' and safely ignore the error messages and use the +existing info files. After Emacs is installed, you can run it by typing `emacs -nw' from a terminal (make sure your path contains /usr/local/bin) or by -double-clicking on mac/Emacs.app in the Finder. To start Emacs as a -GUI application from the terminal, the pathname to the executable in -the bundle, i.e., +double-clicking on /Applications/Emacs.app in the Finder. To start +Emacs as a GUI application from the terminal, the pathname to the +executable in the bundle, i.e., - .../emacs/mac/Emacs.app/Contents/MacOS/Emacs + /Application/Emacs.app/Contents/MacOS/Emacs must be typed to the shell to enable Emacs to locate its resources -correctly. +correctly. You may want to create a symlink or alias to this path to +quickly access both the terminal and GUI versions. If you are building Emacs to run on Mac OS X and X Window, you need to create a directory containing statically-linked X libraries. @@ -79,7 +88,8 @@ :sc=\E7:rc=\E8:cs=\E[%i%d;%dr: ----- -To build the `info' files, you need to install the texinfo software. +To build the `info' files in versions prior to Mac OS X 10.2, you need +to install the texinfo software. To install from source, obtain texinfo-4.2.tar.gz from ftp.gnu.org or a mirror. Un-tar it, enter its directory and type @@ -88,7 +98,7 @@ make make install -The last step needs to be performed as root. +The last step may need to be performed as root (sudo make install). You may also like to install ispell, which will allow you to use ispell and flyspell-mode. To install ispell from source, you first @@ -101,7 +111,7 @@ make make install -Again, the last step needs to be performed as root. Note that if you +Again, the last step may need to be performed as root. Note that if you run `make check', the test for `pr' will fail. Get and un-tar ispell-3.2.06.tar.gz. Look for it here: @@ -142,9 +152,6 @@ --prefix=DIR - Place the common emacs files in the given DIR. The default is /usr/local. See note below if placing in /usr ---without-app - Do not install the carbon gui in /Applications - This will be commonly used for terminal-only or X - windows installs. --self-contained - Place the common emacs files inside the Emacs.app itself. This makes the application trivial to uninstall and copy between computers.
--- 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 {} \;