anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change environment variable to LYX_USERDIR_14x

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10266 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2005-07-17 01:59:18 +00:00
parent 008dad0e3a
commit eb07dfa12b
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/support/ChangeLog
View File

@ -1,3 +1,8 @@
2005-07-17 Michael Schmitt <michael.schmitt@teststep.org>
* package.C.in:
* package.h: change environment variable to LYX_USERDIR_14x
2005-07-14 Angus Leeming <leeming@lyx.org>
* filename.[Ch] (mangledFilename): add an optional "dir" parameter

12
src/support/package.C.in
View File

@ -492,11 +492,11 @@ get_system_support_dir(string const & abs_binary,
return path;
}
// 2. Use the "LYX_DIR_13x" environment variable.
path = extract_env_var_dir("LYX_DIR_13x");
// 2. Use the "LYX_DIR_14x" environment variable.
path = extract_env_var_dir("LYX_DIR_14x");
if (!path.empty()) {
searched_dirs.push_back(path);
if (check_env_var_dir(path, chkconfig_ltx, "LYX_DIR_13x"))
if (check_env_var_dir(path, chkconfig_ltx, "LYX_DIR_14x"))
return path;
}
@ -586,7 +586,7 @@ get_system_support_dir(string const & abs_binary,
"having searched\n"
"\t%1$s\n"
"Try the '-sysdir' command line parameter or "
"set the environment variable LYX_DIR_13x to "
"set the environment variable LYX_DIR_14x to "
"the LyX system directory containing the file "
"`chkconfig.ltx'."),
searched_dirs_str)
@ -613,8 +613,8 @@ get_user_support_dir(string const & default_user_support_dir,
if (!path.empty())
return std::make_pair(path, explicit_userdir);
// 2. Use the LYX_USERDIR_13x environment variable.
path = extract_env_var_dir("LYX_USERDIR_13x");
// 2. Use the LYX_USERDIR_14x environment variable.
path = extract_env_var_dir("LYX_USERDIR_14x");
if (!path.empty())
return std::make_pair(path, explicit_userdir);

2
src/support/package.h
View File

@ -92,7 +92,7 @@ public:
/** The user_support directory was set explicitly using either
* the -userdir command line switch or
* the LYX_USERDIR_13x environment variable.
* the LYX_USERDIR_14x environment variable.
*/
bool explicit_user_support() const;