Rtools30 is preferred.

Tweaks for OS X.


git-svn-id: https://svn.r-project.org/R/branches/R-2-15-branch@62059 00db46b3-68df-0310-9c12-caf00c1e9a41

doc/manual/R-admin.texi

@@ -444,11 +444,11 @@ make info     @r{to create info files (not @samp{refman} nor @samp{fullrefman}).
 @end example
 
 You will not be able to build any of these unless you have
-@command{makeinfo} version 4.7 to 4.13 installed, and for PDF you must
-have @command{texi2dvi} and @file{texinfo.tex} installed (which are part
-of the @acronym{GNU} @pkg{texinfo} distribution but are, especially
-@file{texinfo.tex}, often made part of the @TeX{} package in
-re-distributions).
+@command{makeinfo} version 4.7 to 4.13 installed@footnote{version 5.0 is
+not supported.}, and for PDF you must have @command{texi2dvi} and
+@file{texinfo.tex} installed (which are part of the @acronym{GNU}
+@pkg{texinfo} distribution but are, especially @file{texinfo.tex}, often
+made part of the @TeX{} package in re-distributions).
 
 The PDF versions can be viewed using any recent PDF viewer: they have
 hyperlinks that can be followed.  The info files are suitable for
@@ -1054,13 +1054,13 @@ make rsync-recommended
 @end itemize
 
 The following additional items are normally installed by
-@file{Rtools215.exe}.  If instead you choose to do a completely manual
+@file{Rtools30.exe}.  If instead you choose to do a completely manual
 build you will also need
 
 @itemize
 
 @item
-The Tcl/Tk support files are contained in @file{Rtools215.exe} and
+The Tcl/Tk support files are contained in @file{Rtools30.exe} and
 available as @file{.zip}s from
 @uref{http://www.stats.ox.ac.uk/pub/Rtools}.  Please make sure you
 install the right version: there is a 32-bit version and a 64-bit
@@ -1461,27 +1461,24 @@ account used to install @R{}.
 @sc{R.app}
 @end macro
 
-The @file{bin/macosx} directory of a @acronym{CRAN} site contains
-binaries for OS X for a base distribution and a large number of
-add-on packages from @acronym{CRAN} to run on OS X 10.[5678] (Leopard,
-Snow Leopard, Lion, Mountain Lion) with Intel CPUs.
+The front package of a @acronym{CRAN} site has a link `Download R for OS
+X'. Click on that, then download the file @file{R-@value{VERSIONno}.pkg}
+and install it. This runs on OS X 10.[5678] (Leopard, Snow Leopard,
+Lion, Mountain Lion) with Intel CPUs.
 
-The simplest way is to use @file{R-@value{VERSIONno}.pkg}: just
-double-click on the icon.  Note that (X11-based) Tcl/Tk needs to be
-installed separately if needed, from
-@uref{http://cran.r-project.org/bin/macosx/tools/}, and for Mountain
-Lion XQuartz will also need to be installed to use Tk.
+To install, just double-click on the icon of the file you downloaded.
+Note that (X11-based) Tcl/Tk needs to be installed separately if needed,
+from @uref{http://cran.r-project.org/bin/macosx/tools/}, and for
+Mountain Lion XQuartz will also need to be installed to use Tk.
 
 On Mountain Lion with `GateKeeper' active you may need to
 right/control-click on some of the packages (e.g.@: that for Tcl/Tk) and
 select @samp{Open}.
 
-The binary version of @R{} is provided as an Apple Installer package. If
-you encounter any problem during the installation, please check the
-Installer log by clicking on the ``Window'' menu and item ``Installer
-Log''. The full output (select ``Show All Log'') is useful for tracking
-down problems.
-
+This is an Apple Installer package. If you encounter any problem during
+the installation, please check the Installer log by clicking on the
+``Window'' menu and item ``Installer Log''. The full output (select
+``Show All Log'') is useful for tracking down problems.
 
 For building @R{} from source, see @ref{Mac OS X}.
 
@@ -1514,7 +1511,8 @@ consisted of three packages: @code{org.r-project.R.Leopard.fw.pkg},
 --unlink} (not supported as of Lion) to remove their files or
 @code{pkgutil --forget} if you want the Apple Installer to forget about
 the package without deleting its files (useful for the @R{} framework
-when installing multiple R versions in parallel).
+when installing multiple R versions in parallel), or after you have
+deleted the files.
 
 
 @node Running R, Add-on packages, Installing R under (Mac) OS X, Top
@@ -4204,7 +4202,7 @@ Line Tools for Xcode' and and suitable compilers (including a version of
 @command{gfortran}). You will also need
 @code{readline} (or to configure with @option{--without-readline}).
 
-You may also want to install an X sub-system (or you will need to
+You may also need to install an X sub-system (or you will need to
 configure with @option{--without-x}): X is part of the standard OS X
 distribution in versions prior to Mountain Lion, but not always
 installed.  For Mountain Lion, see
@@ -4264,7 +4262,11 @@ Note that the Apple versions of GCC (where available, and those on
 @R{} platforms, including @code{CRAN}'s incoming checks) are better at
 detecting coding errors.  If can be well worth checking your code with
 @command{clang}/@command{clang++}: @R{} itself is checked with
-@command{clang 4.x}.
+@command{clang 4.x}.  If your C compiler does not support Objective C,
+you can use @command{clang}, e.g.@: by
+@example
+OBJC='clang -arch x86_64'
+@end example
 
 Recent compilers default to 64-bit, but some older ones (supplied at the
 time of Leopard) default to 32-bit.  It is safest to explicitly specify
@@ -4277,10 +4279,9 @@ F77='gfortran-4.2 -arch x86_64'
 FC='gfortran-4.2 -arch x86_64'
 OBJC='gcc-4.2 -arch x86_64'
 @end example
-in @file{config.site} or on the @command{configure} command line.
-
-To produce a 32-bit build, use @samp{i386} instead of @samp{x86_64}.
-Care is needed, as @code{gfortran} may default to a different
+in @file{config.site} or on the @command{configure} command line.  To
+produce a 32-bit build, use @samp{i386} instead of @samp{x86_64}.  Care
+@strong{is} needed, as @code{gfortran} may default to a different
 architecture from the C compilers.
 
 
@@ -4483,8 +4484,8 @@ The current sources can be checked out by
 svn co https://svn.r-project.org/R-packages/trunk/Mac-GUI
 @end example
 This can be built by loading @code{R.xcodeproj} project (select
-the @code{R} target and the @code{Lion64} configuration), or from the
-command-line by
+the @code{R} target and a suitable configuration), or from the
+command-line by e.g.@:
 @example
 xcodebuild -target R -configuration Lion64
 @end example
@@ -5036,7 +5037,7 @@ the @R{} mailing lists unless you have followed all the prescriptions.}
 
 We have collected most of the necessary tools (unfortunately not all,
 due to license or size limitations) into an executable installer
-named@footnote{for @R{} 2.14.2 and later.}  @file{Rtools215.exe},
+named@footnote{for @R{} 2.14.2 and later.}  @file{Rtools30.exe},
 available from @uref{http://CRAN.R-project.org/@/bin/@/windows/@/Rtools/}. You
 should download and run it, choosing the default ``Package authoring
 installation'' to build add-on packages, or the ``full installation'' if
@@ -5199,8 +5200,8 @@ Windows-style paths.
 Technically you need more than just a compiler so the set of tools is
 referred to as a `toolchain'.
 
-The preferred toolchain since @R{} 2.14.2 is part of
-@code{Rtools215.exe}: this uses a beta version of @command{gcc 4.6.3}
+The preferred toolchain is part of
+@code{Rtools30.exe}: this uses a beta version of @command{gcc 4.6.3}
 and version 2.0.1 of the MinGW-w64 project's runtime.
 
 This toolchain uses @emph{multilib}: that is there is a single front-end
@@ -5242,7 +5243,7 @@ Developers of packages will find some of the `goodies' at
 
 There is a version of the @command{file} command that identifies the
 type of files, and is used by @command{Rcmd check} if available.  The
-binary distribution is included in @file{Rtools215.exe}.
+binary distribution is included in @file{Rtools30.exe}.
 
 The file @file{xzutils.zip} contains the program @command{xz} which can
 be used to (de)compress files with that form of compression.