diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-17 20:46:33 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-06-17 20:48:23 -0700 |
| commit | 3f4e765c05ddbae83ca0c0176572cd698f285d08 (patch) | |
| tree | 4c9818e7fb222c0bc4007c8005d996de68c42c76 /micropeak/Makefile.am | |
| parent | 495e84540943cccb6d1cb965a772021f7dc5f639 (diff) | |
Fix java version detection and downloading
Move java stuff to a common include file, java.nsh
Let any version no older than 1.6 serve by using ${VersionCompare}
Use version 6 downloads as those don't require a click-through agreement.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'micropeak/Makefile.am')
| -rw-r--r-- | micropeak/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index 216874df..39ebc43a 100644 --- 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 $@ - 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' > $@ |