Makefile does not generate a correct wubi-selfextract.exe

When cleaning up the code I didn't merge the following changes in the Makefile, that result in a self-extract unable to unpack itself since the internal executable name is different from the one stored in 7zip.conf. Patch provided (but untested)

--- Makefile.old 2008-06-24 15:42:36.000000000 +0100
+++ Makefile.new 2008-06-24 15:44:14.000000000 +0100
@@ -61,9 +61,10 @@
        du -h dist/Wubi*.exe

 wubi-selfextract: wubi
- cd dist; 7z a wubi.7z Wubi*.exe
+ cp dist/Wubi*.exe dist/wubi.exe
+ cd dist; 7z a wubi.7z wubi.exe
        cat tools/7zS.sfx data/7zip.conf dist/wubi.7z > dist/wubi-selfextract.exe
- rm dist/wubi.7z
+ rm dist/wubi.7z dist/wubi.exe

 license: license.in
        sed -e "s/@VERSION@/$(VERSION)/g" < $^ > $@