X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/77a4e329cda4fa53e4ebae2ae0c4f1e515d08893..75e6b97059b6e5b012b1084677070add5c5b0c19:/mac/INSTALL

diff --git a/mac/INSTALL b/mac/INSTALL
index 51b306c463..88306ae057 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -1,6 +1,6 @@
 * BUILDING EMACS ON MAC OS 8/9 AND MAC OS X     -*- outline -*-
 
-Copyright (c) 2001, 2002 Free Software Foundation, Inc.
+Copyright (c) 2001, 2002, 2004 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
@@ -58,16 +58,11 @@ must be typed to the shell to enable Emacs to locate its resources
 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.
+If you are building Emacs to run on Mac OS X and X Window,
+instead of typing `./configure' above, type
 
-  sudo mkdir /usr/X11R6/libstatic
-  cd /usr/X11R6/libstatic
-  sudo ln -s ../lib/lib*.a ../lib/X11 .
+  ./configure --without-carbon --with-x
 
-Instead of typing `./configure' above, type
-
-  ./configure --without-carbon --with-x --x-libraries=/usr/X11R6/libstatic
 
 To use colors in a terminal, put the following lines in the file
 ~/.termcap and log in again.
@@ -88,7 +83,7 @@ vt100|vt100-am|vt100am|dec vt100:\
     :sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
 -----
 
-To build the `info' files in versions prior to Mac OS X 10.2, you need 
+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
@@ -98,7 +93,7 @@ a mirror.  Un-tar it, enter its directory and type
   make
   make install
 
-The last step may need to be performed as root (sudo make install). 
+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
@@ -110,7 +105,7 @@ Un-tar it, enter its directory, type
   ./configure --host=powerpc-apple-bsd
   make
   make install
-    
+
 Again, the last step may need to be performed as root.  Note that if you
 run `make check', the test for `pr' will fail.
 
@@ -148,22 +143,17 @@ in a file called EmacsInstaller.dmg.  This file can be then distributed
 to whomever would like a binary distribution.  Here are the common
 options to user
 
---with-x         -  Use the X11 GUI instead of the Carbon GUI. 
+--with-x         -  Use the X11 GUI instead of the Carbon GUI.
 --prefix=DIR     -  Place the common emacs files in the given DIR.  The
 		    default is /usr/local.  See note below if placing
 		    in /usr
 --self-contained -  Place the common emacs files inside the Emacs.app
 		    itself.  This makes the application trivial to
 		    uninstall and copy between computers.
---app-symlink    -  Use a symlink inside the Application to the 
+--app-symlink    -  Use a symlink inside the Application to the
 	      	    $prefix/bin/emacs to reduce disk space.  Note, this
 		    option may removed in the future.
 
-If you are intending to build a binary distribution for X windows, you
-will probably want to follow the directions above to create static
-X11R6 libraries and run the make-package script like this
-
-./make-package --with-x -C,--x-libraries=/usr/X11R6/libstatic
 
 For usage of other options, use the --help option.
 
@@ -175,7 +165,7 @@ to build Emacs.  MPW-GM can be downloaded free of charge from Apple.
 In either case, you will need MPW-GM to build the make-docfile utility
 and to generate the doc string file DOC.
 
-### IMPORTANT ### You can use StuffIf Expander to decompress and untar
+### IMPORTANT ### You can use StuffIt Expander to decompress and untar
 the distribution.  However, you *must* set the radio button in the
 Preferences->Cross Platform->Convert text files to Macintosh format to
 "Never".  Otherwise the compiled Lisp files will be corrupted.
@@ -210,12 +200,12 @@ dialog and include the Profiler PPC.Lib library.
 
 * NOTES
 
-Emacs should build and run on a PowerMac running Mac OS 8.6 - 10.2.
+Emacs should build and run on a PowerMac running Mac OS 8.6 - 10.3.
 
 You will need around 100 MB of disk space for the source files and
 intermediate files.
 
-It will not run on machines running Mac OS 8/9 with more than 256 MB
+It will not run on machines running Mac OS 8/9 with more than 512 MB
 of physical or virtual memory.  It does not have this restriction when
 it is run under Mac OS X.  But the usual 128MB buffer limit of a
 32-bit Emacs still exists.