From 56994d215815139207f3c5ce02a1720e44e93c09 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 17 Apr 2021 16:31:09 +0200
Subject: Update runtime files.

---
 src/INSTALLmac.txt | 91 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 36 deletions(-)

(limited to 'src/INSTALLmac.txt')

diff --git a/src/INSTALLmac.txt b/src/INSTALLmac.txt
index be0f87e993..9980d258c4 100644
--- a/src/INSTALLmac.txt
+++ b/src/INSTALLmac.txt
@@ -1,64 +1,83 @@
-INSTALLmac.txt - Installation of Vim on Macintosh
+INSTALLmac.txt - Installation of Vim on Apple MacOS
 
 This file contains instructions for compiling Vim. If you already have an
 executable version of Vim, you don't need this.
 
-First, make sure you've installed Xcode or CommandLineTools.  If not, open a
-terminal and do
-
-	$ make --version
-
-A window pops up instructing you to install the developer tools.
+MacOS Classic is no longer supported.  If you really want it use Vim 6.4.
+Only '/' is supported as path separator.
 
 
 ----------------------------------------------------------------------------
-Summary
+Prerequisites
 ----------------------------------------------------------------------------
 
-1 MacOS X
- 1.1. Terminal version
- 1.2. X (Athena, GTK, Motif) or plain text.
+Make sure you've installed Xcode and CommandLineTools.  You can download Xcode
+from the Mac App Store, for free.
 
-MacOS Classic is no longer supported.  If you really want it use Vim 6.4.
+To check for CommandLineTools open a terminal and do:
 
-----------------------------------------------------------------------------
-1 MacOS X
-----------------------------------------------------------------------------
+	$ make --version
+
+If not installed yet a window pops up instructing you to install the developer
+tools.
 
-1.0 Considerations
+If you don't have the source yet, best is to use git (which you need to
+install first), see http://www.vim.org/git.php
+Or you can download and unpack the Unix tar archive, see
+   http://www.vim.org/download.php
 
- Only '/' is supported as path separator.
 
-1.1 Terminal version (default)
+----------------------------------------------------------------------------
+Build and install the terminal version.
+----------------------------------------------------------------------------
 
- You can compile vim with the standard Unix routine:
-   cd .../src
+You can compile vim with the standard Unix routine:
+   cd vim/src
    make
    make test
    sudo make install
 
- You need at least Xcode 1.5.
+If you get an error "glibtool: command not found" search on stackoverflow for
+mac-osx-where-can-i-download-glibtool.
 
- To overrule the architecture do this before running make:
+With Homebrew, run:
 
-	./configure --with-mac-arch=intel
- or
-	./configure --with-mac-arch=ppc
+      brew install libtool
 
+To build libtool from source:
 
-1.2 X-Windows
+    1. Download the source code from https://www.gnu.org/software/libtool/.
 
- You must explicitly tell configure to use a GUI.
+    2. Run these commands from the root of the source code directory:
 
-  cd .../src
-  ./configure --disable-darwin --enable-gui=gtk2
-  make; make install
+           ./configure --program-prefix=g
+           make
+           sudo make install
 
- NOTE: The following GUI options are possible (but might not work):
-	no (for terminal only), motif, athena, nextaw
-	gtk, gtk2, gnome, gnome2,
 
- NOTE: You need to first install XFree86 and XDarwin.
-       Please visit http://www.XDarwin.org
+----------------------------------------------------------------------------
+Build and install the GUI version with X-Windows
+----------------------------------------------------------------------------
+
+First, install XQuartz, which you can download from https://www.xquartz.org.
+
+To tell configure to use a GUI you can edit the Makefile and uncomment these
+two lines (remove the # at the start of the line):
+
+    CONF_OPT_GUI = --enable-gui=athena
+    CONF_OPT_DARWIN = --disable-darwin
+
+Do "make distclean" to start with a clean slate.
+Then build as with the terminal version above.
+Instead of "athena" you can try "gtk2" but you probably need to install GTK
+first.
+
+
+----------------------------------------------------------------------------
+Notes
+----------------------------------------------------------------------------
+
+Mac-specific configure options are explained in the Makefile:
+	--disable-darwin
+	--with-mac-arch
 
-------------------------------------------------------
-- 
cgit v1.2.3