Fix java version detection and downloading

[fw/altos] / micropeak / Makefile.am

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 216874dfb362c5fe0d518a85fd191bfaacdd991f..39ebc43a069df837a49ddf841c6a8783160c7ba4 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -272,7 +272,7 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
        -rm -f $@
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
        -rm -f $@

-       makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi
+       makensis -Omicropeak-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" micropeak-windows.nsi || (cat micropeak-windows.log && exit 1)

 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@