--- openmsx-0.6.1/build/cpu-x86.mk.orig	2006-07-23 19:50:57.000000000 +0100
+++ openmsx-0.6.1/build/cpu-x86.mk	2006-08-06 18:30:46.000000000 +0100
@@ -9,7 +9,7 @@
 ifeq ($(filter darwin%,$(OPENMSX_TARGET_OS)),)
 # To run openMSX with decent speed, at least a Pentium 2 class machine
 # is needed, so let's optimise for that.
-OPENMSX_FLAVOUR?=i686
+OPENMSX_FLAVOUR?=rpm
 else
 # The system headers of OS X use SSE features, which are not available on
 # i686, so we only use the generic optimisation flags instead.
--- openmsx-0.6.1/build/cpu-ppc.mk.orig	2004-07-10 16:25:01.000000000 +0100
+++ openmsx-0.6.1/build/cpu-ppc.mk	2006-08-13 16:07:26.000000000 +0100
@@ -6,5 +6,5 @@
 BIG_ENDIAN:=true
 
 # Default build flavour.
-OPENMSX_FLAVOUR?=ppc
+OPENMSX_FLAVOUR?=rpm
 
--- openmsx-0.6.1/build/cpu-x86_64.mk.orig	2004-10-09 07:32:02.000000000 +0100
+++ openmsx-0.6.1/build/cpu-x86_64.mk	2006-08-13 16:07:38.000000000 +0100
@@ -6,5 +6,5 @@
 BIG_ENDIAN:=false
 
 # Default build flavour.
-OPENMSX_FLAVOUR?=opt
+OPENMSX_FLAVOUR?=rpm