Index: INSTALL.MacOSX
===================================================================
--- INSTALL.MacOSX	(revision 31652)
+++ INSTALL.MacOSX	(working copy)
@@ -23,9 +23,13 @@
 
 1. Qt/Mac Opensource Edition, version 4. This library is GPL-
 licensed and can be downloaded from
-<http://trolltech.com/developer/downloads/qt/mac/>. To compile it,
-create a directory where you want to install QT4. In the following, 
-the full path to this directory is called /path/to/QT4
+<http://get.qt.nokia.com/qt/source/>. Make sure to download a source-
+code file (with src included in the name). 
+On MacOSX 10.5 and lower Qt version 4.4 is normally used. On MacOSX
+10.6 you will need QT version 4.6.
+To compile it, create a directory where you want to install QT4. 
+In the following, the full path to this directory is called 
+/path/to/QT4
 Decompress Qt/Mac in a convenient directory, cd to the top of the
 Qt source hierarcy, and enter:
 
@@ -68,10 +72,18 @@
 If you did not install pkg-config, first set the LDFLAGS variable:
 
      export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -framework Cocoa"
+     
+For MacOSX 10.6 you need to set the following flags:
 
+     export CPPFLAGS="-arch i386"
+     export CCFLAGS="-arch i386"
+     export CFLAGS="-arch i386"
+     export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz -framework Cocoa -arch i386"
+
+
 Then, cd to the top of the LyX source hierarchy, and enter:
 
-     ./configure --prefix=/path/to/LyX.app --with-version-suffix=-1.6 --with-qt4-dir=/path/to/QT4 --with-included-gettext --enable-optimization=-Os
+     ./configure --prefix=/Path/to/LyX.app --disable-concept-checks --with-version-suffix=-1.6 --with-qt4-dir=/Path/to/QT4/ --enable-optimization=-Os --without-x --with-included-gettext --with-frontend=qt4 --disable-stdlib-debug --without-aspell --without-pspell --disable-shared --enable-static --enable-build-type=rel
      make
      make install-strip
 
@@ -79,7 +91,7 @@
 user's directory being located at ~/Library/Application Support/LyX-1.6)
 
 
-(b) Developmental Versions (svn checkouts)
+(b) Developmental Versions (svn checkouts that can be used for debugging)
 
 Building LyX from developmental sources requires a few more steps.
 Instead of the instructions above, do the following:
@@ -88,10 +100,17 @@
 
      export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -framework Cocoa"
 
+For MacOSX 10.6 you need to set the following flags:
+
+     export CPPFLAGS="-arch i386"
+     export CCFLAGS="-arch i386"
+     export CFLAGS="-arch i386"
+     export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz -framework Cocoa -arch i386"
+
 Then, cd to the top of the LyX source hierarchy, and enter:
 
      ./autogen.sh
-     ./configure --prefix=/path/to/LyX.app --with-version-suffix=-1.6 --with-qt4-dir=/path/to/QT4 --with-included-gettext --enable-optimization=-Os
+     ./configure --prefix=/Path/to/LyX.app --disable-concept-checks --with-version-suffix=-1.6 --with-qt4-dir=/Path/to/QT4/ --without-x --with-included-gettext --with-frontend=qt4 --without-aspell --without-pspell --disable-shared --enable-static
      make
      make install-strip