adapt for DOS

diff --git a/makefile b/makefile
index d36ede3743e548f041e7ffc3ab19a9e7aea9b0e2..2f126ba8b2df9d5a7b248d2c97d24d05cb94fb0a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -16,12 +16,20 @@ CFLAGS += $(OFLAGS) $(INCLUDES) $(OPTIONS)
 LDFLAGS += -g $(LDOPTS) $(OPTIONS)
 
 LDOPT = linker
-ifeq ($(OS),Windows_NT)
+MV = mv
+ifneq (, $(findstring linux, $(MAKE_HOST)))
+# Linux
+else ifneq (, $(findstring mingw, $(MAKE_HOST)))
+# Windows MinGw
 #LDLIBS += -lws2_32
 LDOPT = winlnk
-endif
-ifeq ($(OS),Dos)
+else ifneq (, $(findstring cygwin, $(MAKE_HOST)))
+# Windows CygWin
+LDOPT = winlnk
+else ifneq (, $(findstring msdos, $(MAKE_HOST)))
+# MSDOS
 LDOPT = doslnk
+MV = move
 endif
 
 # Targets
@@ -62,7 +70,7 @@ count:
 clean:
        $(call TITLE, "Cleaning")
        touch clean
-       rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_* gmon.out) _
+       rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_* gmon.out _)
        $(call PASS, SUCCESS)
 
 depends: $(patsubst %.c, %.d, $(wildcard *.c)) $(patsubst %, %.ld, $(ALLEXE))
@@ -154,7 +162,7 @@ valgrind_%: %.exe
        $(call TITLE, "Building $@")
        $(CC) $(INCLUDES) -MM $< -o $@~
        echo ${<:.c=.o}: $(shell $(call GETCOMMENTS,depends, $<)) >> $@~
-       mv $@~ $@
+       $(MV) $@~ $@
        $(call PASS, SUCCESS)
 
 %.ld: %.c