diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-06-24 21:31:53 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-06-24 21:31:53 -0600 |
| commit | 6986da4407ac53e267b95abb1848211ea9d32b41 (patch) | |
| tree | b27b296e48d2463989227c3e4ddeddf9e5600677 /micropeak/Makefile.am | |
| parent | 5f6059a9273dfe557145a9f620db81693f3bc27e (diff) | |
| parent | 237472e1b98283a82c674bb48c0347189d9d37bf (diff) | |
Merge branch 'branch-1.4' of ssh://git.gag.com/scm/git/fw/altos into branch-1.4
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' > $@ |