From 070e45b229cfa071c98039ef81b5b781229cabba Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Fri, 17 Apr 2020 18:38:51 +0200 Subject: [PATCH] Add default path to server pipe (cmake build + unix) Actually the change is affecting only builds if 1.) Using cmake build 2.) on unix To use it on cygwin: one has to patch development/cygwin/lyxrc.dist.in MacOSX: -//- development/MacOSX/lyxrc.dist.in We need also a Windows-version Also the compilation with automake lacks the handling of development/unix/lyxrc.dist.in --- development/unix/lyxrc.dist.in | 1 + src/LyXRC.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/development/unix/lyxrc.dist.in b/development/unix/lyxrc.dist.in index 3b10a816fa..6e64df115a 100644 --- a/development/unix/lyxrc.dist.in +++ b/development/unix/lyxrc.dist.in @@ -13,4 +13,5 @@ Format 25 \texinputs_prefix ".:@LYX_ABS_INSTALLED_DATADIR@tex" +\serverpipe "$$User/.lyxpipe" diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index f7c085c64c..3b0add1ea6 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -670,7 +670,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_SERVERPIPE: if (lexrc.next()) - lyxpipes = os::internal_path(lexrc.getString()); + lyxpipes = subst(os::internal_path(lexrc.getString()), "$$User", + package().user_support().absFileName()); break; case RC_CT_ADDITIONS_UNDERLINED: -- 2.39.5