[MLton-commit] r7359

[Wesley Terpstra]

MSI filenames must match for windows to be able to work.


----------------------------------------------------------------------

U   mlton/trunk/package/mingw/Makefile

----------------------------------------------------------------------

Modified: mlton/trunk/package/mingw/Makefile
===================================================================
--- mlton/trunk/package/mingw/Makefile	2009-11-03 12:58:22 UTC (rev 7358)
+++ mlton/trunk/package/mingw/Makefile	2009-11-03 13:56:11 UTC (rev 7359)
@@ -18,12 +18,12 @@
 MLton-$(VERSION).exe:	data.7z
 	cat 7zS.sfx MLton.conf data.7z > $@
 
-data.7z:	MLton.msi
+data.7z:	staging/MLton-$(VERSION).msi
 	rm -f $@
-	7z a $@ -mx9 -mmt $<
+	cd staging; 7z a ../$@ -mx9 -mmt $(<F)
 
 .INTERMEDIATE: MLton.msi
-MLton.msi:	mlton.wixobj dirs.wixobj files.wixobj $(PKG_WIXOBJ)
+staging/MLton-$(VERSION).msi:	mlton.wixobj dirs.wixobj files.wixobj $(PKG_WIXOBJ)
 	light -dcl:none -cultures:en-us -ext WixUIExtension -out $@ $^
 MLton-$(VERSION).msi:	mlton.wixobj dirs.wixobj files.wixobj $(PKG_WIXOBJ)
 	light -dcl:high -cultures:en-us -ext WixUIExtension -out $@ $^