-- Remove OSTYPE since it's not really needed any more. Only needs to

   be set to w32 on windows hosts.  Otherwise we don't need to
   distinguish between linux and darwin.

emmett/Makefile

@@ -2,19 +2,11 @@
 #
 # Usage: make -f Makefile <options>
 # where the options are:
-#  OSTYPE=<os>    the host os type: win, linux, or mac (required)
+#  OSTYPE=<os>    set to w32 on windows hosts
 #  TGTDIR=<dir>   the target directory (required)
 #
 
-ifneq ($(OSTYPE), win)
-ifneq ($(OSTYPE), linux)
-ifneq ($(OSTYPE), mac)
-$(error Invalid host OS type (must be win, linux, or mac))
-endif
-endif
-endif
-
-ifeq ($(OSTYPE), Win32)
+ifeq ($(OSTYPE), w32)
 EXE_EXTENSION	:= .exe
 CP		:= copy
 else
@@ -36,7 +28,7 @@ OCAMLC	  = ocamlc
 OCAMLLEX  = ocamllex
 OCAMLYACC = ocamlyacc
 
-ifeq ($(OSTYPE), Win32)
+ifeq ($(OSTYPE), w32)
 OCAMLLINK = $(SRCDIR)/ocamllink.bat
 else
 OCAMLLINK = $(OCAMLC) -custom

emmett/Makefile.java

@@ -2,26 +2,18 @@
 #
 # Usage: make -f Makefile.java <options>
 # where the options are:
-#  OSTYPE=<os>     the host os type: win, linux, or mac (required)
+#  OSTYPE=<os>     set to w32 on windows hosts
 #  TGTDIR=<dir>    the target directory (required)
 #  OCAMLJAVA=<dir> path to the ocaml jar files (from cadmium distribution)
 #
 # See http://ocamljava.x9c.fr/ for more details regarding OCaml-Java.
 #
 
-ifneq ($(OSTYPE), win)
-ifneq ($(OSTYPE), linux)
-ifneq ($(OSTYPE), mac)
-$(error Invalid host OS type (must be win, linux, or mac))
-endif
-endif
-endif
-
 ifeq ($(TGTDIR),)
 $(error Undefined target directory (TGTDIR))
 endif
 
-ifeq ($(OSTYPE), win)
+ifeq ($(OSTYPE), w32)
 CP		:= copy
 else
 CP		:= cp