X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=INSTALL.MacOSX;h=3acceb66a088e82a09dd16893db165e1fbcc8bb4;hb=a762244ca675d0cc77441307fe50ef392335373d;hp=866d5dde6a6d0c2a852f6c3ea3e84a73363974c5;hpb=253b1bc32b97b34ba50d3e848a092451ed53c1cb;p=lyx.git diff --git a/INSTALL.MacOSX b/INSTALL.MacOSX index 866d5dde6a..3acceb66a0 100644 --- a/INSTALL.MacOSX +++ b/INSTALL.MacOSX @@ -93,7 +93,7 @@ The aspell library is GPL-licensed and can be downloaded from ftp://ftp.gnu.org/gnu/aspell or one of the mirrors. At the time of writing aspell-0.60.tar.gz is the current version. Unpack the tarball in the same directory where you placed the -svn checkout or LyX tarball. +git checkout or LyX tarball. BUILD INSTRUCTIONS @@ -166,10 +166,10 @@ adjust some environment variables to do so. The required compiler flags to compile a Qt4 application has to be provided. - export QT4_CORE_CFLAGS="-FQtCore" - export QT4_CORE_LIBS="-framework QtCore" - export QT4_FRONTEND_CFLAGS="-FQtGui" - export QT4_FRONTEND_LIBS="-framework QtGui" + export QT_CORE_CFLAGS="-FQtCore" + export QT_CORE_LIBS="-framework QtCore" + export QT_FRONTEND_CFLAGS="-FQtGui" + export QT_FRONTEND_LIBS="-framework QtGui" Depending on the architecture and target os add the compiler flags: @@ -202,7 +202,7 @@ adjust some environment variables to do so. --with-libiconv-prefix=/usr \ --with-x=no \ --prefix=/path/to/LyX.app \ - --with-qt4-dir=/path/to/Qt4 + --with-qt-dir=/path/to/Qt4 make make install-strip @@ -210,7 +210,7 @@ adjust some environment variables to do so. user's directory being located at ~/Library/Application Support/LyX-2.0) -(b) Developmental Versions (svn checkouts) +(b) Developmental Versions (git checkouts) Building LyX from developmental sources requires a few more steps. Instead of the instructions above, do the following: @@ -224,14 +224,10 @@ Instead of the instructions above, do the following: --with-x=no \ --disable-stdlib-debug \ --prefix=/path/to/LyX.app \ - --with-qt4-dir=/path/to/Qt4 + --with-qt-dir=/path/to/Qt4 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 --enable-build-type=release to configure. - (c) Distribution build @@ -243,7 +239,7 @@ Please read the script if you're about to make a distributable disk image. To use it, cd to the top of the LyX source hierarchy, and enter: - sh development/LyX-Mac-binary-release.sh --with-qt4-dir=/path/to/Qt4 + sh development/LyX-Mac-binary-release.sh --with-qt-dir=/path/to/Qt4 This script automates all steps of the build process. It detects the sources for Qt4, Aspell and Hunspell when placed in a @@ -254,7 +250,7 @@ Per default the resulting LyX application is build for ppc and i386 to be usable on all systems from Tiger upwards. -(d) Developmental Versions (svn checkouts and Qt4 frameworks) +(d) Development Versions (git checkouts and Qt4 frameworks) Instead of the instructions in (b), do the following: