Amend(3) 689f26d2: Add default path to server pipe (cmake build)

Omit duplicated separators if replacing string '$$User' with actual userdir

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 3b0add1ea662cdec78cb8a8c6be049466a2abea9..d5a727327fea0b017926386389c67eb2fb6c1c21 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -669,9 +669,13 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                        break;
 
                case RC_SERVERPIPE:
-                       if (lexrc.next())
+                       if (lexrc.next()) {
+                               string userdir = package().user_support().absFileName();
+                               if (userdir.back() == '/')
+                                 userdir = userdir.substr(0, userdir.size()-1);
                                lyxpipes = subst(os::internal_path(lexrc.getString()), "$$User",
-                                       package().user_support().absFileName());
+                                       userdir);
+                       }
                        break;
 
                case RC_CT_ADDITIONS_UNDERLINED: