update OSX instructions

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10478 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 671a914806929bc4c06ac59b3350be2e20084291..39e7279eae9452dca3056774ce90da955d23d78a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-22  Bennett Helm  <bennett.helm@fandm.edu>
+
+       * INSTALL.MacOSX: update to reflect simplified procedure.
+

 2005-09-21  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * Makefile.am (EXTRA_DIST): distribute INSTALL.MacOSX
 2005-09-21  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * Makefile.am (EXTRA_DIST): distribute INSTALL.MacOSX

diff --git a/INSTALL.MacOSX b/INSTALL.MacOSX
index 0aa370cf67b6c35ff54c106d3146ed152b3599be..e3c500147de9a6032d30bbdc1d1e8cb4e1c7c84b 100644 (file)
--- a/INSTALL.MacOSX
+++ b/INSTALL.MacOSX
@@ -10,33 +10,42 @@ 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".
 
 tcsh shell, change the "export VAR=value" statements to
 "setenv VAR value".
 

+At the moment, compiling LyX/Mac requires using gcc version 3.3. You
+can tell OS X to use this compiler by entering the following in the
+terminal:
+
+     sudo gcc_select 3.3
+

 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:
 
      export QTDIR=`pwd`
 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:
 
      export QTDIR=`pwd`

-     sudo gcc_select 3.3
-     ./configure -static -no-exceptions   [for Panther, use "./configure -static -no-exceptions -lresolv"]
+     ./configure -static -no-exceptions -lresolv   [for OS X 10.2, use "./configure -static -no-exceptions"]

      make
      rm lib/libqt.la
 
 2. The LyX/Mac application bundle skeleton (LyX.app) can be found in 
      make
      rm lib/libqt.la
 
 2. The LyX/Mac application bundle skeleton (LyX.app) can be found in 

-development/MacOSX. This bundle should be moved to some convenient
-place. (These instructions assume it is placed in /Applications and
-named LyX.app.)
+the LyX source hierarchy at development/MacOSX. The default settings
+assume that this bundle has been moved to /Applications and is named
+LyX.app. You can rename it or move it somewhere else, but make sure
+you read the note in step 3.

 
 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"
 
 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 --prefix=/Applications/LyX.app --enable-maintainer-mode --with-included-gettext --enable-optimization=-Os --disable-concept-checks
+     ./configure --with-frontend=qt --without-x --with-included-gettext --enable-optimization=-Os --disable-concept-checks
+
+[Note: If you have moved or renamed the LyX/Mac application bundle
+skeleton, you will need to add "--prefix=/path/to/LyX.app"
+(substituting the appropriate path, of course) to this ./configure
+line. (If you do not specify anything for --prefix, the default is
+--prefix=/Applications/LyX.app.)]
+     

      make
      make install
      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 for the Mac OS X native icon files included in the LyX/Mac 
-skeleton to be used.]

 
 The information on this page is believed to be accurate, has been used
 successfully on many systems and sites, and has benefited from the
 
 The information on this page is believed to be accurate, has been used
 successfully on many systems and sites, and has benefited from the