change environment variable to LYX_USERDIR_14x

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10266 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 9698f22f2ddae579005d7a3bd137ec9792cbb887..d5e58f2947990f35312f26481a2f9e1282b28aed 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -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

diff --git a/src/support/package.C.in b/src/support/package.C.in
index a839648a73eeb2564c9836d452f5837204d4d3c4..c205d05c91c085dff6c3ab85a5171a61958fa4f1 100644 (file)
--- a/src/support/package.C.in
+++ b/src/support/package.C.in
@@ -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);
 

diff --git a/src/support/package.h b/src/support/package.h
index dcbb52949af33b196fbd74a2ba561cb97e7f5f49..2b44462f0627be877b242031b94a73124a2eed94 100644 (file)
--- a/src/support/package.h
+++ b/src/support/package.h
@@ -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;