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.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 23e93907552b42c97c8cb0cf1c63f70f20006dfb..15516c891cdb540054a41f188a6399287735caa4 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-18  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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  <dmoncayo@gmail.com>  (tiny change)
 
        * makefile.w32-in: Fix typo (Bug#10261).

diff --git a/nt/configure.bat b/nt/configure.bat
index e0362c5c278ec46d9dcb0fff6eba72bd12fd472a..caee800bacf0eebd5edd97dc8db57d774aa19204 100755 (executable)
--- 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.\r
 rem\r
 echo # Start of settings from configure.bat >config.settings\r
-echo COMPILER=%COMPILER%>>config.settings\r
-if not "(%mf%)" == "()" echo MCPU_FLAG=%mf%>>config.settings\r
-if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo%>>config.settings\r
+echo COMPILER=%COMPILER% >>config.settings\r
+if not "(%mf%)" == "()" echo MCPU_FLAG=%mf% >>config.settings\r
+if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo% >>config.settings\r
 if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings\r
 if (%noopt%) == (Y) echo NOOPT=1 >>config.settings\r
 if (%enablechecking%) == (Y) echo ENABLECHECKS=1 >>config.settings\r
 if (%profile%) == (Y) echo PROFILE=1 >>config.settings\r
 if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings\r
-if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings\r
-if not "(%distfiles%)" == "()" echo DIST_FILES=%distfiles%>>config.settings\r
+if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix% >>config.settings\r
+if not "(%distfiles%)" == "()" echo DIST_FILES=%distfiles% >>config.settings\r
 rem We go thru docflags because usercflags could be "-DFOO=bar" -something\r
 rem and the if command cannot cope with this\r
 for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y\r
-if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags%>>config.settings\r
-if (%docflags%)==(Y) echo ESC_USER_CFLAGS=%escusercflags%>>config.settings\r
+if (%docflags%)==(Y) echo USER_CFLAGS=%usercflags% >>config.settings\r
+if (%docflags%)==(Y) echo ESC_USER_CFLAGS=%escusercflags% >>config.settings\r
 for %%v in (%userldflags%) do if not (%%v)==() set doldflags=Y\r
-if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags%>>config.settings\r
+if (%doldflags%)==(Y) echo USER_LDFLAGS=%userldflags% >>config.settings\r
 for %%v in (%extrauserlibs%) do if not (%%v)==() set doextralibs=Y\r
-if (%doextralibs%)==(Y) echo USER_LIBS=%extrauserlibs%>>config.settings\r
+if (%doextralibs%)==(Y) echo USER_LIBS=%extrauserlibs% >>config.settings\r
 echo # End of settings from configure.bat>>config.settings\r
 echo. >>config.settings\r
 \r
@@ -752,8 +752,8 @@ echo. >>config.tmp
 echo /* Start of settings from configure.bat.  */ >>config.tmp\r
 rem   We write USER_CFLAGS and USER_LDFLAGS starting with a space to simplify\r
 rem   processing of compiler options in w32.c:get_emacs_configuration_options\r
-if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%">>config.tmp\r
-if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%">>config.tmp\r
+if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%" >>config.tmp\r
+if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%" >>config.tmp\r
 if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp\r
 if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp\r
 if not "(%HAVE_GNUTLS%)" == "()" echo #define HAVE_GNUTLS 1 >>config.tmp\r