diff --git a/Makefile b/Makefile
index 468eac9..9b12921 100644
--- a/Makefile
+++ b/Makefile
@@ -43,13 +43,6 @@ ifeq ($(GOOS),)
 endif
 
 ifeq ($(GOOS),windows)
-ifeq ($(MSYSTEM),MSYS)
-WIN_MSYS=1
-endif
-endif
-
-
-ifdef WIN_MSYS
 INSTPREFIX = /usr
 else
 INSTPREFIX = /usr/local
@@ -85,7 +78,7 @@ client: common
 
 
 server: common
-ifeq ($(MSYSTEM),MSYS)
+ifeq ($(GOOS),windows)
 	echo "Build of xsd server for Windows not yet supported"
 else
 	$(MAKE) BUILDOPTS=$(BUILDOPTS) -C xsd
@@ -110,11 +103,10 @@ lint:
 reinstall: uninstall install
 
 install:
-	echo "WIN_MSYS:" $(WIN_MSYS)
-ifdef WIN_MSYS
+ifeq ($(GOOS),windows)
 	cp xs/xs $(INSTPREFIX)/bin/xs
 	cp xs/xs $(INSTPREFIX)/bin/xc
-	echo "Install of xsd server for Windows not yet supported"
+	@echo "Install of xsd server for Windows not yet supported"
 else
 	cp xs/xs $(INSTPREFIX)/bin
 	cd $(INSTPREFIX)/bin && ln -s xs xc && cd -