From 286b0c9f3335a39fa64435e49f63a3d28b21f3d5 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 9 Dec 2017 09:41:45 +0100 Subject: [PATCH] Fix `make setup dos', second try (#52622). * builds/detect.mk (dos_setup): Don't use literal `>' character at all. Mixing the different escaping rules from make, dos, and windows is too fragile. --- ChangeLog | 8 ++++++++ builds/detect.mk | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee8663b50..15cd2f83e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-12-08 Werner Lemberg + + Fix `make setup dos', second try (#52622). + + * builds/detect.mk (dos_setup): Don't use literal `>' character at + all. Mixing the different escaping rules from make, dos, and + windows is too fragile. + 2017-12-08 Werner Lemberg [docmaker] Fix code section parsing. diff --git a/builds/detect.mk b/builds/detect.mk index e5100a60f..34814f113 100644 --- a/builds/detect.mk +++ b/builds/detect.mk @@ -131,8 +131,8 @@ std_setup: # Special case for Dos, Windows, OS/2, where echo "" doesn't work correctly! # -# For `cmd.exe', we have to escape (unquoted) special characters like `>' as -# `^>', and we use 0xFF as a replacement character for a protected space. +# For `cmd.exe', we use 0xFF as a replacement character for a protected +# space. # dos_setup: @type builds$(SEP)newline @@ -149,7 +149,7 @@ dos_setup: @echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help. @type builds$(SEP)newline @echo Otherwise, simply type 'make' again to build the library. - @echo or 'make refdoc' to build the API reference (this needs python ^>= 2.6). + @echo or 'make refdoc' to build the API reference (this needs at least python 2.6). @type builds$(SEP)newline @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul