Commit 286b0c9f3335a39fa64435e49f63a3d28b21f3d5

Werner Lemberg 2017-12-09T09:41:45

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.

diff --git a/ChangeLog b/ChangeLog
index ee8663b..15cd2f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2017-12-08  Werner Lemberg  <wl@gnu.org>
 
+	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  <wl@gnu.org>
+
 	[docmaker] Fix code section parsing.
 
 	Stuff like
diff --git a/builds/detect.mk b/builds/detect.mk
index e5100a6..34814f1 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