diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-06-24 21:56:25 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-06-24 21:56:25 -0600 |
| commit | 27dbfb4f01f30457fccb22cfe2aba2b3b022a020 (patch) | |
| tree | 7e047deddb829859b8abf93610e3436cff4b8aa5 /micropeak/Makefile.am | |
| parent | 5d0af8e108b5b8dc39779e80bb76e04a54dcb5ea (diff) | |
| parent | 655a75a884db0fe2b40a0eb957efa943df49fecd (diff) | |
Merge branch 'branch-1.4' into debian
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' > $@ |