--- Makefile.orig	Thu Aug 17 17:58:17 2006
+++ Makefile	Thu Aug 17 17:59:12 2006
@@ -142,31 +142,31 @@
 #	ưǧƤΤϡfreebsd/linux ΤߤǤ
 
 #---------------------- FreeBSD
-# ARCH = freebsd
+# OSARCH = freebsd
 #---------------------- Linux
-# ARCH = linux
+# OSARCH = linux
 #---------------------- NetBSD
-# ARCH = netbsd
+# OSARCH = netbsd
 #---------------------- OpenBSD
-# ARCH = openbsd
+# OSARCH = openbsd
 #---------------------- Solaris / SunOS
-# ARCH = solaris
+# OSARCH = solaris
 #---------------------- QNX Neutrino (QNX4\QNX6)
-# ARCH = nto
+# OSARCH = nto
 #---------------------- OpenStep on NeXT systems
-# ARCH = next
+# OSARCH = next
 #---------------------- OpenStep on Apple systems (Cocoa)
-# ARCH = macosx
+# OSARCH = macosx
 #---------------------- IRIX ( with sound requires the dmedia package ) (*)
-# ARCH = irix
+# OSARCH = irix
 #---------------------- IRIX ( with sound using the new al package) (*)
-# ARCH = irix_al
+# OSARCH = irix_al
 #---------------------- aix ( with sound, you'll need the UMS and SOM lpp's installed ( under AIX4 ))
-# ARCH = aix
+# OSARCH = aix
 #---------------------- BeOS on Intel
-# ARCH = beos
+# OSARCH = beos
 #---------------------- generic unix, no sound
-ARCH = generic
+OSARCH = generic
 
 
 
@@ -306,7 +306,7 @@
 #######################################################################
 # ɤͭˤʤäƤγƼ
 #######################################################################
-ifneq ($(ARCH),generic)
+ifneq ($(OSARCH),generic)
 
 #
 # ͭΡɲå֥ ( OS¸ +  )
@@ -346,7 +346,7 @@
 #these need to be converted to plugins first
 #SOUND_OBJS.aix     = $(DSP_DIR)/aix.o
 
-SOUND_OBJS	= $(SOUND_OBJS.$(ARCH))	\
+SOUND_OBJS	= $(SOUND_OBJS.$(OSARCH))	\
 		  $(DSP_DIR)/esound.o	\
 		  $(DSP_DIR)/artssound.o\
 		  $(DSP_DIR)/arts.o 	\
@@ -391,7 +391,7 @@
 #these need to be converted to plugins first
 #CFLAGS.aix        = -DSYSDEP_DSP_AIX -I/usr/include/UMS -I/usr/lpp/som/include
 
-SOUND_OPT		= -DUSE_SOUND $(CFLAGS.$(ARCH)) -I$(SRCDIR)/$(QUASI_DIR) -I$(SRCDIR)/$(SRC_DIR) -I$(SRCDIR)/$(UNIX_DIR) -I$(SRCDIR)/$(SOUND_DIR) -I$(SRCDIR)/$(SYSDEP_DIR) -I$(SRCDIR)/$(DSP_DIR) -I$(SRCDIR)/$(MIXER_DIR)
+SOUND_OPT		= -DUSE_SOUND $(CFLAGS.$(OSARCH)) -I$(SRCDIR)/$(QUASI_DIR) -I$(SRCDIR)/$(SRC_DIR) -I$(SRCDIR)/$(UNIX_DIR) -I$(SRCDIR)/$(SOUND_DIR) -I$(SRCDIR)/$(SYSDEP_DIR) -I$(SRCDIR)/$(DSP_DIR) -I$(SRCDIR)/$(MIXER_DIR)
 
 
 #
@@ -408,7 +408,7 @@
 LIBS.nto	   = -lsocket -lasound
 LIBS.beos          = `$(SDL_CONFIG) --libs`
 
-SOUND_LIB		= -lm $(LIBS.$(ARCH))
+SOUND_LIB		= -lm $(LIBS.$(OSARCH))
 
 
 #
@@ -495,7 +495,7 @@
 	  -DBIT32='$(TYPE_SPECIFIER_OF_32BIT)' $(JOYSTICK) $(IGNORE_OPT) \
 	  -DQ_TITLE='"$(NAME)"' -DQ_VERSION='"$(VERSION)"' $(SELECT) \
 	  $(MONITOR) $(SSS_CMD) $(USELOCALE) $(KEYBOARD_BUG) $(USE_FMGEN) \
-	  -D__ARCH_$(ARCH) -DPI=M_PI $(SOUND_OPT) $(CONFIG)
+	  -D__ARCH_$(OSARCH) -DPI=M_PI $(SOUND_OPT) $(CONFIG)
 
 CXXFLAGS += -Isrc $(X11INC) $(USEINLINE) \
 	  -DROM_DIR='"$(ROMDIR)"' -DDISK_DIR='"$(DISKDIR)"' \
@@ -503,7 +503,7 @@
 	  -DBIT32='$(TYPE_SPECIFIER_OF_32BIT)' $(JOYSTICK) $(IGNORE_OPT) \
 	  -DQ_TITLE='"$(NAME)"' -DQ_VERSION='"$(VERSION)"' $(SELECT) \
 	  $(MONITOR) $(SSS_CMD) $(USELOCALE) $(KEYBOARD_BUG) $(USE_FMGEN) \
-	  -D__ARCH_$(ARCH) -DPI=M_PI $(SOUND_OPT) $(CONFIG)
+	  -D__ARCH_$(OSARCH) -DPI=M_PI $(SOUND_OPT) $(CONFIG)
 
 LIBS   = $(X11LIB) -lX11 -lXext $(DGA_LIB) $(READLINELIB) $(SOUND_LIB) $(MY_LIBS)
 
