From 97704380ae77a60cfe88d71a7a691487162d4e0d Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 15 Jul 2005 22:13:33 +0000 Subject: [PATCH] tweaks to Max OSX config from Bennett git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10229 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 6 +++++ INSTALL.MacOSX | 22 ++++++++++++++----- development/ChangeLog | 7 ++++++ .../Resources/{LyX => lyx}/preferences | 2 +- 4 files changed, 30 insertions(+), 7 deletions(-) rename development/MacOSX/LyX.app/Contents/Resources/{LyX => lyx}/preferences (96%) diff --git a/ChangeLog b/ChangeLog index 139c3deab0..e72a25547d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ +2005-07-16 Bennett Helm + + * INSTALL.MacOSX: revised, since the LyX.app skeleton is now + included in the source rather than a separate download + 2005-07-15 Jean-Marc Lasgouttes + * NEWS: * ANNOUNCE: update with changes 2005-07-14 Jean-Marc Lasgouttes diff --git a/INSTALL.MacOSX b/INSTALL.MacOSX index ff0f21162c..98f96e7f04 100644 --- a/INSTALL.MacOSX +++ b/INSTALL.MacOSX @@ -10,9 +10,10 @@ 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". -1. Download the LyX/Mac skeleton from - and unpack it -in /Applications. +1. Locate the LyX.app skeleton in your LyX source hierarchy at +development/MacOSX/LyX.app. Copy LyX.app to someplace convenient -- +such as /Applications. (The directions below under (3) and (4) assume +that you have copied LyX.app to /Applications.) 2. Download the GPL-licensed Qt/Mac Free Edition library source code from , untar in a @@ -24,16 +25,25 @@ convenient directory, cd to the top of the Qt source hierarcy, and: make rm lib/libqt.la -3. Using the same terminal session you used to build the Qt library, -cd to the top of the LyX source hierarchy, and: +3. Configure LyX for compilation as follows. + +Using the same terminal session you used to build the Qt library, +cd to the top of the LyX source hierarchy, and enter: export LDFLAGS="-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz" ./configure --with-frontend=qt --without-x --prefix=/Applications/LyX.app -[Note: to make a build that works with both 10.2 and 10.3, include +[Note #1: Adjust the --prefix setting to point to where you have +copied LyX.app from step (1), if necessary.] + +[Note #2: to make a build that works with both 10.2 and 10.3, include "am_cv_func_iconv=no ac_cv_func_tsearch=no ac_cv_working_alloca_h=no ac_cv_header_dlfcn_h=no ac_cv_func_feof_unlocked=no ac_cv_header_nl_types_h=no am_cv_langinfo_codeset=no ac_cv_func_stpcpy=no" in the configure line.] +4. Compile and install LyX. + +Still at the top of the LyX source hierarchy, enter the following: + make make install [use "make install-strip" to remove debugging information] rm /Applications/LyX.app/Contents/Resources/LyX/images/lyx.xpm diff --git a/development/ChangeLog b/development/ChangeLog index ca7eedd563..63a08632ca 100644 --- a/development/ChangeLog +++ b/development/ChangeLog @@ -1,3 +1,10 @@ +2005-07-16 Bennett Helm + + * MacOSX/LyX.app/Contents/Resources/lyx: rename from .../LyX. + + * MacOSX/LyX.app/Contents/Resources/lyx/preferences: change + \serverpipe to point to the new location of the users directory + 2004-09-29 Jean-Marc Lasgouttes * lyx.spec.in: remove dependencies diff --git a/development/MacOSX/LyX.app/Contents/Resources/LyX/preferences b/development/MacOSX/LyX.app/Contents/Resources/lyx/preferences similarity index 96% rename from development/MacOSX/LyX.app/Contents/Resources/LyX/preferences rename to development/MacOSX/LyX.app/Contents/Resources/lyx/preferences index c86677d8e0..8097bd8a73 100644 --- a/development/MacOSX/LyX.app/Contents/Resources/LyX/preferences +++ b/development/MacOSX/LyX.app/Contents/Resources/lyx/preferences @@ -16,7 +16,7 @@ # MISC SECTION ###################################### # -\serverpipe "~/.lyx/.lyxpipe" +\serverpipe "~/Library/Application Support/LyX/.lyxpipe" \preview true #