Merge from emacs-24 branch

[bpt/emacs.git] / nextstep / INSTALL

diff --git a/nextstep/INSTALL b/nextstep/INSTALL
index 564a8f5..1e7109a 100644 (file)
--- a/nextstep/INSTALL
+++ b/nextstep/INSTALL
@@ -1,4 +1,4 @@
-Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 2008-2012 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -8,10 +8,6 @@ Compilation
 In the top-level directory, use:
 
   ./configure --with-ns
-  make -j2
-
-Make the -j higher on multi-core systems, usually one higher than number of
-cores is best.
 
 This will compile all the files, but emacs will not be able to be run except
 in -nw (terminal) mode.
@@ -27,15 +23,6 @@ files will be installed under whatever 'prefix' is set to (defaults to
 /usr/local).  The bundle will be smaller, but depend on these resources (may
 require 'sudo' for "make install").
 
-On OS X you can also open Cocoa/Emacs.xcodeproj and build it again there.  You
-may need to set some directories.  (Note, ZeroLink currently does not work
-with Emacs owing to the use of private_extern in the code as well as some
-other, unidentifiable problem.)  Before doing this you must run "make install"
-once as outlined above, to set up the lisp resources.
-
-On GNUstep, you CAN'T use ProjectCenter, since PC cannot work with files
-outside of its project directory.
-
 
 Installation
 ------------
@@ -50,16 +37,6 @@ Building as outlined above will create ordinary binaries running on your
 architecture only.  To create universal binaries, set CFLAGS to include
 "-arch ppc -arch i386".
 
-
-Improve Ctrl-G Handling
------------------------
-
-To enable a version of the code that handles ctrl-g more responsively in
-certain cases -- but may introduce other glitches -- pass
-"--enable-cocoa-experimental-ctrl-g" to configure.
-
-
-
 \f
 This file is part of GNU Emacs.