--- Makefile.orig	2008-12-18 13:45:07.000000000 -0800
+++ Makefile	2010-02-27 15:21:32.000000000 -0800
@@ -26,12 +26,12 @@
           cpu-a.asm dct-32.asm
 X86SRC = $(X86SRC0:%=common/x86/%)
 
-ifeq ($(ARCH),X86)
+ifeq ($(ARCH),i386)
 ARCH_X86 = yes
 ASMSRC   = $(X86SRC) common/x86/pixel-32.asm
 endif
 
-ifeq ($(ARCH),X86_64)
+ifeq ($(ARCH),amd64)
 ARCH_X86 = yes
 ASMSRC   = $(X86SRC:-32.asm=-64.asm)
 ASFLAGS += -DARCH_X86_64
@@ -47,7 +47,7 @@
 endif
 
 # AltiVec optims
-ifeq ($(ARCH),PPC)
+ifeq ($(ARCH),powerpc)
 ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
               common/ppc/quant.c common/ppc/deblock.c \
               common/ppc/predict.c