new layout and template file for ACM SIGPLAN articles

[lyx.git] / INSTALL.MacOSX

diff --git a/INSTALL.MacOSX b/INSTALL.MacOSX
index 75e150198186689f66ab187b3eee66f65ff36131..7937f38b7d4f3953d9352d20c603734a503c523e 100644 (file)
--- a/INSTALL.MacOSX
+++ b/INSTALL.MacOSX
@@ -1,7 +1,7 @@
 Building LyX/Mac-1.5
 Ronald Florence <ron@18james.com>
 Building LyX/Mac-1.5
 Ronald Florence <ron@18james.com>

-Modified by Bennett Helm <bennett.helm@fandm.edu> and by Anders
-Ekberg <anek@mac.com>.
+Modified by Bennett Helm <bennett.helm@fandm.edu>, Anders
+Ekberg <anek@mac.com> and Jean-Marc Lasgouttes <lasgouttes@lyx.org>.

 
 LyX/Mac is built from the LyX source, the GPL-licensed Trolltech
 Qt/Mac library, and a custom application bundle.
 
 LyX/Mac is built from the LyX source, the GPL-licensed Trolltech
 Qt/Mac library, and a custom application bundle.


@@ -23,7 +23,7 @@ well.
 
 1. Qt/Mac Opensource Edition, version 4. This library is GPL-
 licensed and can be downloaded from
 
 1. Qt/Mac Opensource Edition, version 4. This library is GPL-
 licensed and can be downloaded from

-<http://www.trolltech.com/download/qt/mac.html>. To compile it,
+<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
 Decompress Qt/Mac in a convenient directory, cd to the top of the
 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


@@ -35,22 +35,26 @@ Qt source hierarcy, and enter:
      cd /path/to/QT4/lib
      rm *.la
 
      cd /path/to/QT4/lib
      rm *.la
 

-2. [Needed only for developmental builds:] automake, version 1.5
+2. [Needed only for developmental builds:] automake, version 1.10

 or higher (check with automake --version). Probably the easiest
 or higher (check with automake --version). Probably the easiest

-way to get this is to use DarwinPorts (from
-http://darwinports.opendarwin.org/getdp/) and install automake
-using
+way to get this is to use MacPorts (from http://www.macports.org/)
+and install automake using

 
      sudo port install automake
 
 3. [Needed only for developmental builds:] gettext version >= 0.12
 (check with gettext --version). If the installed version is
 insufficient the easiest way to obtain a later version is to use
 
      sudo port install automake
 
 3. [Needed only for developmental builds:] gettext version >= 0.12
 (check with gettext --version). If the installed version is
 insufficient the easiest way to obtain a later version is to use

-DarwinPorts (from http://darwinports.opendarwin.org/getdp/) and
-install gettext using:
+MacPorts (from http://www.macports.org/) and install gettext
+using:

 
      sudo port install gettext
 
 
      sudo port install gettext
 

+4. [Useful to simplify detection of Qt:] pkg-config >= 0.9.0. Again,
+the simplest way is through MacPorts:
+
+     sudo port install pkgconfig
+

 
 BUILD INSTRUCTIONS
 
 
 BUILD INSTRUCTIONS
 


@@ -61,15 +65,18 @@ where you installed Qt for /path/to/QT4 (as above).
 
 (a) Official Releases
 
 
 (a) Official Releases
 

-cd to the top of the LyX source hierarchy, and enter:
+If you did not install pkg-config, first set the LDFLAGS variable:
+
+     export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -framework Cocoa"

 
 

-     export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz -framework Cocoa"
-     ./configure --prefix=/path/to/LyX.app --with-version-suffix=-1.5 --without-x --with-frontend=qt4 --with-qt4-dir=/path/to/QT4 --with-included-gettext --enable-optimization=-Os
+Then, cd to the top of the LyX source hierarchy, and enter:
+
+     ./configure --prefix=/path/to/LyX.app --with-version-suffix=-1.6 --without-x --with-qt4-dir=/path/to/QT4 --with-included-gettext --enable-optimization=-Os

      make
      make install-strip
 
      make
      make install-strip
 

-(Note that the --with-version-suffix=-1.5 option will result in LyX's
-user's directory being located at ~/Library/Application Support/LyX-1.5.)
+(Note that the --with-version-suffix=-1.6 option will result in LyX's
+user's directory being located at ~/Library/Application Support/LyX-1.6)

 
 
 (b) Developmental Versions (svn checkouts)
 
 
 (b) Developmental Versions (svn checkouts)


@@ -77,14 +84,20 @@ user's directory being located at ~/Library/Application Support/LyX-1.5.)
 Building LyX from developmental sources requires a few more steps.
 Instead of the instructions above, do the following:
 
 Building LyX from developmental sources requires a few more steps.
 Instead of the instructions above, do the following:
 

-cd to the top of the LyX source hierarchy, and enter:
+If you did not install pkg-config, first set the LDFLAGS variable:
+
+     export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -framework Cocoa"
+
+Then, cd to the top of the LyX source hierarchy, and enter:

 
 

-     export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz -framework Cocoa"

      ./autogen.sh
      ./autogen.sh

-     ./configure --prefix=/path/to/LyX.app --with-version-suffix=-1.5 --without-x --with-frontend=qt4 --with-qt4-dir=/path/to/QT4 --with-included-gettext --enable-optimization=-Os --disable-stdlib-debug --disable-concept-checks
+     ./configure --prefix=/path/to/LyX.app --with-version-suffix=-1.6 --without-x --with-qt4-dir=/path/to/QT4 --with-included-gettext --enable-optimization=-Os

      make
      make install-strip
 
      make
      make install-strip
 

+Note that by default svn versions use some extra debugging code that
+somewhat slows LyX down. If it is a real problem, you can pass the
+option --disable-stdlib-debug to configure.

 
 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