Commit fc9df61408bc0e1881fc6114a5340b26e4acc4fe
2004-11-23T17:49:40
* builds/dos/detect.mk: Added same correction as for win32 about COPY on Windows NT. Detection of plain DOS 7.x.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk
index b80686c..451eeb5 100644
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@@ -43,6 +43,20 @@ ifeq ($(PLATFORM),ansi)
ifeq ($(is_dos),)
is_dos := $(findstring MDOS\COMMAND,$(COMSPEC))
endif
+
+ # We also try to recognize Dos 7.x without Windows 9X launched.
+ # See builds\win32\detect.mk for explanations about the logic.
+ ifeq ($(is_dos),)
+ ifdef winbootdir
+#ifneq ($(OS),Windows_NT)
+ # If Win32 is available, do not trigger this test
+ ifndef windir
+ is_dos := $(findstring Windows,$(strip $(shell ver)))
+ endif
+#endif
+ endif
+ endif
+
endif # test COMSPEC
ifneq ($(is_dos),)
@@ -107,7 +121,17 @@ ifeq ($(PLATFORM),dos)
else
SEP := $(BACKSLASH)
DELETE := del
- COPY := copy
+
+ # Setting COPY is a bit trickier. We can be running DJGPP on some
+ # Windows NT derivatives, like XP. See builds\win32\detect.mk for
+ # explanations why we need hacking here.
+ #
+ ifeq ($(OS),Windows_NT)
+ COPY := cmd.exe /c copy
+ else
+ COPY := copy
+ endif # test NT
+
setup: dos_setup
endif