OK I'll try guii1 again ...

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index ecb5e296634089d5907f8b0e8e22e7bd8b6a2acf..7f8e5bb0ba62f70d59a8ff8082e8285b125e27ca 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -262,7 +262,7 @@ void LyX::init(bool gui)
 
        // Directories are searched in this order:
        // 1) -sysdir command line parameter
-       // 2) LYX_DIR_11x environment variable
+       // 2) LYX_DIR_12x environment variable
        // 3) Maybe <path of binary>/TOP_SRCDIR/lib
        // 4) <path of binary>/../share/<name of binary>/
        // 4a) repeat 4 after following the Symlink if <path of
@@ -279,11 +279,11 @@ void LyX::init(bool gui)
        if (!system_lyxdir.empty())
                searchpath= MakeAbsPath(system_lyxdir) + ';';
 
-       // LYX_DIR_11x environment variable
-       string const lyxdir = GetEnvPath("LYX_DIR_11x");
+       // LYX_DIR_12x environment variable
+       string const lyxdir = GetEnvPath("LYX_DIR_12x");
 
        if (!lyxdir.empty()) {
-               lyxerr[Debug::INIT] << "LYX_DIR_11x: " << lyxdir << endl;
+               lyxerr[Debug::INIT] << "LYX_DIR_12x: " << lyxdir << endl;
                searchpath += lyxdir + ';';
        }
 
@@ -359,7 +359,7 @@ void LyX::init(bool gui)
        // Warn if environment variable is set, but unusable
        if (!lyxdir.empty()) {
                if (system_lyxdir != NormalizePath(lyxdir)) {
-                       lyxerr <<_("LYX_DIR_11x environment variable no good.")
+                       lyxerr <<_("LYX_DIR_12x environment variable no good.")
                               << '\n'
                               << _("System directory set to: ")
                               << system_lyxdir << endl;
@@ -371,7 +371,7 @@ void LyX::init(bool gui)
        if (system_lyxdir == "./") {
                lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
                       <<_("Try the '-sysdir' command line parameter or ")
-                      <<_("set the environment variable LYX_DIR_11x to the "
+                      <<_("set the environment variable LYX_DIR_12x to the "
                           "LyX system directory ")
                       << _("containing the file `chkconfig.ltx'.") << endl;
                if (!path_shown) {
@@ -401,15 +401,15 @@ void LyX::init(bool gui)
 
        // Directories are searched in this order:
        // 1) -userdir command line parameter
-       // 2) LYX_USERDIR_11x environment variable
+       // 2) LYX_USERDIR_12x environment variable
        // 3) $HOME/.<name of binary>
 
        // If we had a command line switch, user_lyxdir is already set
        bool explicit_userdir = true;
        if (user_lyxdir.empty()) {
 
-               // LYX_USERDIR_11x environment variable
-               user_lyxdir = GetEnvPath("LYX_USERDIR_11x");
+               // LYX_USERDIR_12x environment variable
+               user_lyxdir = GetEnvPath("LYX_USERDIR_12x");
 
                // default behaviour
                if (user_lyxdir.empty())