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

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

diff --git a/src/support/Package.cpp b/src/support/Package.cpp
index b6da91016fe0df12543eee73674566fbc709c9e8..7ccc5e65c3227d64224007bd77b35ea4791cd2f6 100644 (file)
--- a/src/support/Package.cpp
+++ b/src/support/Package.cpp
@@ -461,11 +461,11 @@ get_system_support_dir(FileName const & abs_binary,
                        return path;
        }
 
-       // 2. Use the "LYX_DIR_15x" environment variable.
-       path = extract_env_var_dir("LYX_DIR_15x");
+       // 2. Use the "LYX_DIR_16x" environment variable.
+       path = extract_env_var_dir("LYX_DIR_16x");
        if (!path.empty()) {
                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;
        }
 
@@ -556,7 +556,7 @@ get_system_support_dir(FileName const & abs_binary,
                                         "having searched\n"
                                         "\t%1$s\n"
                                         "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 "
                                         "`chkconfig.ltx'."),
                          from_utf8(searched_dirs_str)));
@@ -577,8 +577,10 @@ bool userSupportDir(FileName const & default_user_support_dir,
        if (!result.empty())
                return true;
 
-       // 2. Use the LYX_USERDIR_15x environment variable.
-       result = extract_env_var_dir("LYX_USERDIR_15x");
+       // 2. Use the LYX_USERDIR_16x environment variable.
+       // 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())
                return true;
 

diff --git a/src/support/Package.h b/src/support/Package.h
index f5440b924a322b2ad3ca91539fd66bfe85c150ab..0cb4336ee236bd777858dc5bfd35b61ef6f3b000 100644 (file)
--- a/src/support/Package.h
+++ b/src/support/Package.h
@@ -94,7 +94,7 @@ public:
 
        /** The user_support directory was set explicitly using either
         *  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_; }