Minor typo and indentation fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6510 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
47eadad506
commit
7ee1a114a9
8 changed files with 68 additions and 67 deletions
|
@ -172,7 +172,7 @@ static void print_usage()
|
|||
_T(" ") OPT_STR _T("Ofile specifies a text file to log compiler output (default is stdout)\n")
|
||||
_T(" ") OPT_STR _T("PAUSE pauses after execution\n")
|
||||
_T(" ") OPT_STR _T("NOCONFIG disables inclusion of <path to makensis.exe>") PLATFORM_PATH_SEPARATOR_STR _T("nsisconf.nsh\n")
|
||||
_T(" ") OPT_STR _T("NOCD disabled the current directory change to that of the .nsi file\n")
|
||||
_T(" ") OPT_STR _T("NOCD disables the current directory change to that of the .nsi file\n")
|
||||
_T(" ") OPT_STR _T("INPUTCHARSET <") TSTR_INPUTCHARSET _T(">\n")
|
||||
#ifdef _WIN32
|
||||
_T(" ") OPT_STR _T("OUTPUTCHARSET <") TSTR_OUTPUTCHARSET _T(">\n")
|
||||
|
@ -554,7 +554,8 @@ static inline int makensismain(int argc, TCHAR **argv)
|
|||
#else
|
||||
main_conf = PosixBug_CtoTString(PREFIX_CONF);
|
||||
#endif
|
||||
else main_conf = env_var;
|
||||
else
|
||||
main_conf = env_var;
|
||||
main_conf += PLATFORM_PATH_SEPARATOR_STR;
|
||||
main_conf += _T("nsisconf.nsh");
|
||||
if (process_config(build, main_conf))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue