From 60e502702efdf23fc29dc3822148a02434da5c89 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 10 Mar 2004 17:36:14 +0000
Subject: [PATCH] update to osx build instructions

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8484 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog     |  4 ++++
 README.MacOSX | 31 ++++++++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c693da8b7..17cee97d7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-10  Ronald Florence <ron@18james.com>
+
+	* README.MacOSX: update
+
 2004-01-26  Angus Leeming  <leeming@lyx.org>
 
 	* autogen.sh: enable the use of autoconf 2.59.
diff --git a/README.MacOSX b/README.MacOSX
index 9693e48ae8..02f3424ee4 100644
--- a/README.MacOSX
+++ b/README.MacOSX
@@ -1,13 +1,10 @@
 
-			   Building LyX/Mac
+			   Building LyX/Mac-1.4.0
 
 		  Ronald Florence <ron@18james.com>
 
    LyX/Mac is built from the LyX source, the GPL-licensed Trolltech
-   Qt/Mac library, and a custom application bundle.  Qt-3.2.3 and
-   later versions align the button labels in the Math Panel better
-   under MacOS-10.3, but present other problems.  Qt-3.1.2 as patched
-   here is fully functional.
+   Qt/Mac library, and a custom application bundle. 
 
    You will need the MacOSX development tools.  The procedure
    described here builds LyX linked with a static Qt library.  If you
@@ -15,33 +12,33 @@
    to "setenv VAR value".
 
    1.  Download the GPL-licensed Qt/Mac library source code from
-   <ftp://ftp.lyx.org/pub/lyx/contrib/qt-mac-free-3.1.2.sit>, untar in
-   a convenient directory, cd to the top of the Qt source hierarcy,
-   and:
+       <ftp://ftp.lyx.org/pub/lyx/contrib/qt-mac-free-3.1.2.sit>,
+       untar in a convenient directory, cd to the top of the Qt source
+       hierarcy, and:
 
      export QTDIR=`pwd` 
      patch -p0 < LYX-SOURCE-DIRECTORY/development/MacOSX/qt.patch
      sudo gcc_select 3.3 
      ./configure -static   [for Panther, use "./configure -static -lresolv"]
      make 
+     rm lib/libqt.la
+
+   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".
  
-   2.  Using the same terminal session, 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
      make
-     cp -R development/MacOSX/LyX.app /Applications
      make install
      rm /Applications/LyX.app/Contents/Resources/LyX/images/lyx.xpm
 
 
-   For information on configuring LyX/Mac, please see the howto at
-   <http://www.18james.com/lyx_on_aqua.html>. The binary installation
-   of LyX/Mac installs LaTeX fonts and packages, and provides
-   additional functionality including inverse DVI search with some
-   DVI-previewers.
-
    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