--- Makefile.orig	2008-07-01 09:03:42.000000000 +0200
+++ Makefile	2008-07-20 14:28:35.000000000 +0200
@@ -28,6 +28,9 @@
 MM_SVN_SITE := svn.projects.openmoko.org
 MM_SVN_PATH := svnroot/mokomakefile/trunk
 
+MACHINE := $(shell sed -n 's/^MACHINE[[:space:]]*=[[:space:]]*"\(.*\)".*/\1/p' <build/conf/local.conf)
+
+
 .PHONY: all
 all:	openmoko-devel-image \
 	openmoko-devel-tools \
@@ -376,14 +379,14 @@
 .PHONY: flash-neo-kernel-official
 flash-neo-kernel-official: stamps/openmoko-devel-tools stamps/images
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1457:0x5119 -a kernel -D `ls -t ../images/openmoko/uImage-*.bin | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1457:0x5119 -a kernel -D `ls -t ../images/$(MACHINE)/uImage-*.bin | head -1` )
 
 .PHONY: flash-neo-rootfs-official
 flash-neo-rootfs-official: stamps/openmoko-devel-tools stamps/images
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1457:0x5119 -a rootfs -D `ls -t ../images/openmoko/*.jffs2 | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1457:0x5119 -a rootfs -D `ls -t ../images/$(MACHINE)/*.jffs2 | head -1` )
 
 .PHONY: flash-neo-local
 flash-neo-local: flash-neo-kernel-local flash-neo-rootfs-local
@@ -391,14 +394,13 @@
 .PHONY: flash-neo-kernel-local
 flash-neo-kernel-local: stamps/openmoko-devel-tools stamps/openmoko-devel-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1457:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/neo1973/uImage-*.bin | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1457:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/$(MACHINE)/uImage-*.bin | head -1` )
 
 .PHONY: flash-neo-rootfs-local
 flash-neo-rootfs-local: stamps/openmoko-devel-tools stamps/openmoko-devel-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1457:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/neo1973/Openmoko-openmoko-devel-image-*.jffs2 | head -1` )
+		--device 0x1457:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/$(MACHINE)/Openmoko-openmoko-devel-image-*.jffs2 | head -1` )
 
 .PHONY: flash-neo-qtopia
 flash-neo-qtopia: flash-neo-kernel-qtopia flash-neo-rootfs-qtopia
@@ -406,14 +408,14 @@
 .PHONY: flash-neo-kernel-qtopia
 flash-neo-kernel-qtopia: stamps/openmoko-devel-tools stamps/openmoko-qtopia-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1457:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/neo1973/uImage-*.bin | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1457:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/$(MACHINE)/uImage-*.bin | head -1` )
 
 .PHONY: flash-neo-rootfs-qtopia
 flash-neo-rootfs-qtopia: stamps/openmoko-devel-tools stamps/openmoko-qtopia-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1457:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/neo1973/Openmoko-openmoko-qtopia-image-*.jffs2 | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1457:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/$(MACHINE)/Openmoko-openmoko-qtopia-image-*.jffs2 | head -1` )
 
 .PHONY: flash-fr-official
 flash-fr-official: flash-fr-kernel-official flash-fr-rootfs-official
@@ -421,14 +423,14 @@
 .PHONY: flash-fr-kernel-official
 flash-fr-kernel-official: stamps/openmoko-devel-tools stamps/images
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1d50:0x5119 -a kernel -D `ls -t ../images/openmoko/uImage-*.bin | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1d50:0x5119 -a kernel -D `ls -t ../images/$(MACHINE)/uImage-*.bin | head -1` )
 
 .PHONY: flash-fr-rootfs-official
 flash-fr-rootfs-official: stamps/openmoko-devel-tools stamps/images
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1d50:0x5119 -a rootfs -D `ls -t ../images/openmoko/*.jffs2 | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1d50:0x5119 -a rootfs -D `ls -t ../images/$(MACHINE)/*.jffs2 | head -1` )
 
 .PHONY: flash-fr-local
 flash-fr-local: flash-fr-kernel-local flash-fr-rootfs-local
@@ -436,14 +438,14 @@
 .PHONY: flash-fr-kernel-local
 flash-fr-kernel-local: stamps/openmoko-devel-tools stamps/openmoko-devel-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1d50:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/neo1973/uImage-*.bin | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1d50:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/$(MACHINE)/uImage-*.bin | head -1` )
 
 .PHONY: flash-fr-rootfs-local
 flash-fr-rootfs-local: stamps/openmoko-devel-tools stamps/openmoko-devel-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1d50:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/neo1973/Openmoko-openmoko-devel-image-*.jffs2 | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1d50:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/$(MACHINE)/Openmoko-openmoko-devel-image-*.jffs2 | head -1` )
 
 .PHONY: flash-fr-qtopia
 flash-fr-qtopia: flash-fr-kernel-qtopia flash-fr-rootfs-qtopia
@@ -451,14 +453,14 @@
 .PHONY: flash-fr-kernel-qtopia
 flash-fr-kernel-qtopia: stamps/openmoko-devel-tools stamps/openmoko-qtopia-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1d50:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/neo1973/uImage-*.bin | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1d50:0x5119 -a kernel -D `ls -t tmp/deploy/glibc/images/$(MACHINE)/uImage-*.bin | head -1` )
 
 .PHONY: flash-fr-rootfs-qtopia
 flash-fr-rootfs-qtopia: stamps/openmoko-devel-tools stamps/openmoko-qtopia-image
 	( cd build && \
-		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util \
-		--device 0x1d50:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/neo1973/Openmoko-openmoko-qtopia-image-*.jffs2 | head -1` )
+		sudo ./tmp/staging/`uname -m`-`uname -s | tr '[A-Z]' '[a-z]'`/usr/bin/dfu-util* \
+		--device 0x1d50:0x5119 -a rootfs -D `ls -t tmp/deploy/glibc/images/$(MACHINE)/Openmoko-openmoko-qtopia-image-*.jffs2 | head -1` )
 
 .PHONY: push-openembedded
 push-openembedded: update-mtn openembedded/_MTN/revision