2024.08.14:

* fixed: _config/*/config.0.vars.in: default value for `MSYS*_ROOT` variables
andry81 · Aug 25, 2024 · b8a90e1 · b8a90e1
1 parent 3806154
commit b8a90e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/_config/_common/config.0.vars.in b/_config/_common/config.0.vars.in
@@ -49,10 +49,10 @@ CONEMU_CMD64_CMDLINE_RUN_PREFIX             ="%CONEMU64_ROOT%\ConEmu64.exe" -nod
 NPP_EDITOR                                  ="{{NPP_EDITOR}}"
 BASIC_TEXT_EDITOR                           =notepad.exe
 
-# "c:\msys32"
-MSYS32_ROOT                                 ="{{MSYS32_ROOT}}"
-# "c:\msys64"
-MSYS64_ROOT                                 ="{{MSYS64_ROOT}}"
+# "c:\msys32\usr"
+MSYS32_ROOT                                 ="{{MSYS32_ROOT}}\usr"
+# "c:\msys64\usr"
+MSYS64_ROOT                                 ="{{MSYS64_ROOT}}\usr"
 
 MSYS32_MINTTY_TERMINAL_PREFIX               ="%MSYS32_ROOT%\usr\bin\mintty.exe"
 MSYS64_MINTTY_TERMINAL_PREFIX               ="%MSYS64_ROOT%\usr\bin\mintty.exe"

diff --git a/_config/winxp/config.0.vars.in b/_config/winxp/config.0.vars.in
@@ -49,10 +49,10 @@ CONEMU_CMD64_CMDLINE_RUN_PREFIX             ="%CONEMU64_ROOT%\ConEmu64.exe" -nod
 NPP_EDITOR                                  ="{{NPP_EDITOR}}"
 BASIC_TEXT_EDITOR                           =notepad.exe
 
-# "c:\msys32"
-MSYS32_ROOT                                 ="{{MSYS32_ROOT}}"
-# "c:\msys64"
-MSYS64_ROOT                                 ="{{MSYS64_ROOT}}"
+# "c:\msys32\usr"
+MSYS32_ROOT                                 ="{{MSYS32_ROOT}}\usr"
+# "c:\msys64\usr"
+MSYS64_ROOT                                 ="{{MSYS64_ROOT}}\usr"
 
 MSYS32_MINTTY_TERMINAL_PREFIX               ="%MSYS32_ROOT%\usr\bin\mintty.exe"
 MSYS64_MINTTY_TERMINAL_PREFIX               ="%MSYS64_ROOT%\usr\bin\mintty.exe"

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+2024.08.14:
+* fixed: _config/*/config.0.vars.in: default value for `MSYS*_ROOT` variables
+
 2024.08.13:
 * new: deploy/totalcmd/Profile/wincmd.ini.in: totalcmd search templates to search for tacklebar related versioned sources and Windows batch builtins declared by `declare_builtins.bat` script from `contools` project