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

Rename the placeholde $$User to $$UserDir

Make it more readable. Suggestion from Stephan Witt.

diff --git a/development/cygwin/lyxrc.dist.in b/development/cygwin/lyxrc.dist.in
index d1ca1fb6f23cfdf5379e718fd4d3ee0bf796f5f7..5be5e06c4006bf36f457c509806d57fb21597b9b 100644 (file)
--- a/development/cygwin/lyxrc.dist.in
+++ b/development/cygwin/lyxrc.dist.in
@@ -18,5 +18,5 @@ Format 22
 \screen_font_sans "Arial"
 \screen_font_typewriter "Courier New"
 \preview_scale_factor 1.0
 \screen_font_sans "Arial"
 \screen_font_typewriter "Courier New"
 \preview_scale_factor 1.0

-\serverpipe "$$User/lyxpipe"
+\serverpipe "$$UserDir/lyxpipe"

 \path_prefix "/usr/local/bin:/usr/bin:/usr/X11R6/bin"
 \path_prefix "/usr/local/bin:/usr/bin:/usr/X11R6/bin"

diff --git a/development/unix/lyxrc.dist.in b/development/unix/lyxrc.dist.in
index 6e64df115afb951a02ee33d1850c6bd87696ecef..119b13a6f0e7e3f417d0010547bed8483e683d12 100644 (file)
--- a/development/unix/lyxrc.dist.in
+++ b/development/unix/lyxrc.dist.in
@@ -13,5 +13,5 @@
 Format 25
 
 \texinputs_prefix ".:@LYX_ABS_INSTALLED_DATADIR@tex"
 Format 25
 
 \texinputs_prefix ".:@LYX_ABS_INSTALLED_DATADIR@tex"

-\serverpipe "$$User/.lyxpipe"
+\serverpipe "$$UserDir/.lyxpipe"

 
 

diff --git a/development/win32/lyxrc.dist.in b/development/win32/lyxrc.dist.in
index 9b923f1323588c57010859911140417dfdecce33..2de600769aeb5886313e7ac92590944f815abd07 100644 (file)
--- a/development/win32/lyxrc.dist.in
+++ b/development/win32/lyxrc.dist.in
@@ -12,5 +12,5 @@
 
 Format 25
 
 
 Format 25
 

-\serverpipe "\\.\pipe\$$User\lyxpipe"
+\serverpipe "\\.\pipe\$$UserDir\lyxpipe"

 
 

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index d5a727327fea0b017926386389c67eb2fb6c1c21..69072ae4a08a56cd28a193cef412e9e507d13473 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -673,7 +673,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                                string userdir = package().user_support().absFileName();
                                if (userdir.back() == '/')
                                  userdir = userdir.substr(0, userdir.size()-1);
                                string userdir = package().user_support().absFileName();
                                if (userdir.back() == '/')
                                  userdir = userdir.substr(0, userdir.size()-1);

-                               lyxpipes = subst(os::internal_path(lexrc.getString()), "$$User",
+                               lyxpipes = subst(os::internal_path(lexrc.getString()), "$$UserDir",

                                        userdir);
                        }
                        break;
                                        userdir);
                        }
                        break;