From ce1287227544c3a131e002352cff2a01276f2e24 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 May 2012 11:21:19 +0300 Subject: [PATCH] Fix redirection in nt/configure.bat. nt/configure.bat: Ensure a space between %var% expansion and redirection symbol '>', which breaks when %var% ends in a digit, such as 1. --- nt/ChangeLog | 6 ++++++ nt/configure.bat | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 23e93907552..15516c891cd 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2012-05-18 Eli Zaretskii + + * configure.bat: Ensure a space between %var% expansion and + redirection symbol '>', which breaks when %var% ends in a digit, + such as 1. + 2012-04-11 Dani Moncayo (tiny change) * makefile.w32-in: Fix typo (Bug#10261). diff --git a/nt/configure.bat b/nt/configure.bat index e0362c5c278..caee800bacf 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -725,25 +725,25 @@ rem NB. Be very careful to not have a space before redirection symbols rem except when there is a preceding digit, when a space is required. rem echo # Start of settings from configure.bat >config.settings -echo COMPILER=%COMPILER%>>config.settings -if not "(%mf%)" == "()" echo MCPU_FLAG=%mf%>>config.settings -if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo%>>config.settings +echo COMPILER=%COMPILER% >>config.settings +if not "(%mf%)" == "()" echo MCPU_FLAG=%mf% >>config.settings +if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo% >>config.settings if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings if (%noopt%) == (Y) echo NOOPT=1 >>config.settings if (%enablechecking%) == (Y) echo ENABLECHECKS=1 >>config.settings if (%profile%) == (Y) echo PROFILE=1 >>config.settings if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings -if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings -if not "(%distfiles%)" == "()" echo DIST_FILES=%distfiles%>>config.settings +if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix% >>config.settings +if not "(%distfiles%)" == "()" echo DIST_FILES=%distfiles% >>config.settings rem We go thru docflags because usercflags could be "-DFOO=bar" -something rem and the if command cannot cope with this for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y -if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings -if (%docflags%)==(Y) echo ESC_USER_CFLAGS=%escusercflags%>>config.settings +if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags% >>config.settings +if (%docflags%)==(Y) echo ESC_USER_CFLAGS=%escusercflags% >>config.settings for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y -if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings +if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags% >>config.settings for %%v in (%extrauserlibs%) do if not (%%v)==() set doextralibs=Y -if (%doextralibs%)==(Y) echo USER_LIBS=%extrauserlibs%>>config.settings +if (%doextralibs%)==(Y) echo USER_LIBS=%extrauserlibs% >>config.settings echo # End of settings from configure.bat>>config.settings echo. >>config.settings @@ -752,8 +752,8 @@ echo. >>config.tmp echo /* Start of settings from configure.bat. */ >>config.tmp rem We write USER_CFLAGS and USER_LDFLAGS starting with a space to simplify rem processing of compiler options in w32.c:get_emacs_configuration_options -if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%">>config.tmp -if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%">>config.tmp +if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%" >>config.tmp +if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%" >>config.tmp if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp if not "(%HAVE_GNUTLS%)" == "()" echo #define HAVE_GNUTLS 1 >>config.tmp -- 2.11.4.GIT