--- ./Makefile.orig	2008-12-18 22:45:07.000000000 +0100
+++ ./Makefile	2009-03-17 19:09:28.000000000 +0100
@@ -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
