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

diff --git a/development/unix/lyxrc.dist.in b/development/unix/lyxrc.dist.in
index 3b10a816fa08ad6af222b82905ec736586a39135..6e64df115afb951a02ee33d1850c6bd87696ecef 100644 (file)
--- 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 f7c085c64c3cb6e4c3aa372b126ea1ffc66ff216..3b0add1ea662cdec78cb8a8c6be049466a2abea9 100644 (file)
--- 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: