anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 22:17:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Package.cpp: use 16x environment variable (This should be done automatically for new major releases.)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25810 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2008-07-22 20:37:12 +00:00
parent 734e22c4d3
commit 7305378c07
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/support/Package.cpp
View File

@ -461,11 +461,11 @@ get_system_support_dir(FileName const & abs_binary,
return path; return path;
} }
// 2. Use the "LYX_DIR_15x" environment variable. // 2. Use the "LYX_DIR_16x" environment variable.
path = extract_env_var_dir("LYX_DIR_15x"); path = extract_env_var_dir("LYX_DIR_16x");
if (!path.empty()) { if (!path.empty()) {
searched_dirs.push_back(path); searched_dirs.push_back(path);
if (check_env_var_dir(path, chkconfig_ltx, "LYX_DIR_15x")) if (check_env_var_dir(path, chkconfig_ltx, "LYX_DIR_16x"))
return path; return path;
} }
@ -556,7 +556,7 @@ get_system_support_dir(FileName const & abs_binary,
"having searched\n" "having searched\n"
"\t%1$s\n" "\t%1$s\n"
"Use the '-sysdir' command line parameter or " "Use the '-sysdir' command line parameter or "
"set the environment variable LYX_DIR_15x to " "set the environment variable LYX_DIR_16x to "
"the LyX system directory containing the file " "the LyX system directory containing the file "
"`chkconfig.ltx'."), "`chkconfig.ltx'."),
from_utf8(searched_dirs_str))); from_utf8(searched_dirs_str)));
@ -577,8 +577,10 @@ bool userSupportDir(FileName const & default_user_support_dir,
if (!result.empty()) if (!result.empty())
return true; return true;
// 2. Use the LYX_USERDIR_15x environment variable. // 2. Use the LYX_USERDIR_16x environment variable.
result = extract_env_var_dir("LYX_USERDIR_15x"); // FIXME We need to iherit the atual version number from elsewhere other-
// wise we will forget to update this for new major releases
result = extract_env_var_dir("LYX_USERDIR_16x");
if (!result.empty()) if (!result.empty())
return true; return true;

2
src/support/Package.h
View File

@ -94,7 +94,7 @@ public:
/** The user_support directory was set explicitly using either /** The user_support directory was set explicitly using either
* the -userdir command line switch or * the -userdir command line switch or
* the LYX_USERDIR_15x environment variable. * the LYX_USERDIR_16x environment variable.
*/ */
bool explicit_user_support() const { return explicit_user_support_dir_; } bool explicit_user_support() const { return explicit_user_support_dir_; }