X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=README.MacOSX;h=87fedc101f8b152e5bd1d42267d3067c6a306e18;hb=3781da95c0c3872a2d1e18abd5a301c34e68829c;hp=84183e7383ed184e97372137348f58389af04ebb;hpb=0d3bd784340082b60003746fa8e33fd256fcc3cb;p=features.git

diff --git a/README.MacOSX b/README.MacOSX
index 84183e7383..87fedc101f 100644
--- a/README.MacOSX
+++ b/README.MacOSX
@@ -1,47 +1,49 @@
+Building LyX/Mac-1.4.0
+Ronald Florence <ron@18james.com>
+Modified by Bennett Helm <bennett.helm@fandm.edu>
 
-			   Building LyX/Mac-1.4.0
+LyX/Mac is built from the LyX source, the GPL-licensed Trolltech
+Qt/Mac library, and a custom application bundle.
 
-		  Ronald Florence <ron@18james.com>
-		  Modified by Bennett Helm <bennett.helm@fandm.edu>
+You will need the MacOSX development tools. The procedure described
+here builds LyX linked with a static Qt library. If you are using the
+tcsh shell, change the "export VAR=value" statements to
+"setenv VAR value".
 
-   LyX/Mac is built from the LyX source, the GPL-licensed Trolltech
-   Qt/Mac library, and a custom application bundle. 
+1. Download the GPL-licensed Qt/Mac Free Edition library source code
+from <http://www.trolltech.com/download/qt/mac.html>, untar in a
+convenient directory, cd to the top of the Qt source hierarcy, and:
 
-   You will need the MacOSX development tools.  The procedure
-   described here builds LyX linked with a static Qt library.  If you
-   are using the tcsh shell, change the "export VAR=value" statements
-   to "setenv VAR value".
-
-   1.  Download the GPL-licensed Qt/Mac library source code from
-       <http://www.trolltech.com/download/qt/mac.html>,
-       untar in a convenient directory, cd to the top of the Qt source
-       hierarcy, and:
-
-     export QTDIR=`pwd` 
+     export QTDIR=`pwd`
      sudo gcc_select 3.3
      ./configure -static -no-exceptions   [for Panther, use "./configure -static -no-exceptions -lresolv"]
-     make 
+     make
      rm lib/libqt.la
 
+2. Download the LyX/Mac skeleton from
+<ftp://ftp.lyx.org/pub/lyx/stable/lyx-mac-1.3.5-skeleton.tar.gz> and
+unpack it in /Applications. Change the references to "1.4.0" in
+/Applications/LyX.app/Contents/Info.plist to reflect the current
+version number.
 
-   2.  Download the LyX/Mac skeleton from
-       <ftp://ftp.lyx.org/pub/lyx/stable/lyx-mac-1.3.4-skeleton.tar.gz>
-       and unpack it in /Applications.  Change the references to
-       "1.3.4" in /Applications/LyX.app/Contents/Info.plist to
-       "1.4.0".
- 
-   3.  Using the same terminal session you used to build the Qt
-       library, cd to the top of the LyX source hierarchy, and:
+3. Using the same terminal session you used to build the Qt library,
+cd to the top of the LyX source hierarchy, and:
 
      export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz"
      ./configure --with-frontend=qt --without-x --datadir=/Applications/LyX.app/Contents/Resources --bindir=/Applications/LyX.app/Contents/MacOS --mandir=/Applications/LyX.app/Contents/Resources/man --enable-maintainer-mode --with-included-gettext --enable-optimization=-Os
+
      make
      make install
      rm /Applications/LyX.app/Contents/Resources/LyX/images/lyx.xpm
 
+[Note that removing lyx.xpm -- the point of the last line above -- is
+necessary to use the Mac OS X native icon files included in the
+LyX/Mac skeleton.]
+
+The information on this page is believed to be accurate, has been used
+successfully on many systems and sites, and has benefited from the
+comments and suggestions of many users. Due to the variations in
+individual systems, this information is conveyed as is with no
+warranty of any kind.
 
-   The information on this page is believed to be accurate, has been
-   used successfully on many systems and sites, and has benefited from
-   the comments and suggestions of many users. Due to the variations
-   in individual systems, this information is conveyed as is with no
-   warranty of any kind.
+For more information on LyX/Mac, see <http://wiki.lyx.org/pmwiki.php/LyX/Mac>.