Merge remote-tracking branches 'github/merge-requests/581', 'github/merge-requests...

* github/merge-requests/581:
  Fix crash after strange behaviour of the "Really Continue" dialog

* github/merge-requests/576:
  Trap build errors

* github/merge-requests/574:
  Fix spelling mistake occured/occurred

* github/merge-requests/573:
  Partially fix #561: Hi-DPI-aware rendering of images.

diff --git a/src/Makefile.am b/src/Makefile.am
index e61382b..cc0e7ea 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,7 +64,7 @@ ui_icons.h: $(extra_ICONS) Makefile.in
         echo '#ifndef UI_ICONS_H'; \
         echo '#define UI_ICONS_H'; echo; \
         $(GDK_PIXBUF_CSOURCE) --raw --extern --build-list $(ICON_PAIRS); \
-        echo '#endif /* UI_ICONS_H */'" > $@ || echo "!!! Failed to generate $@ !!!"
+        echo '#endif /* UI_ICONS_H */'" > $@ || { echo "!!! Failed to generate $@ !!!"; exit 1; }
 
 ClayRGB1998_icc.h: ClayRGB1998.icc
        echo "/*" > $@