summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPietro Gagliardi <pietro10@mac.com>2014-08-07 17:21:27 -0400
committerJakub Steiner <jimmac@gmail.com>2014-08-08 08:46:14 +0200
commitf093174b8e4f9b56f096bc2cb5e26584dfae89e7 (patch)
tree873246cc2f392c1b38a260e13be3998931e6c996
parent2e5773e54f10ef70499a1ce2c4172736e73daec3 (diff)
downloadadwaita-icon-theme-f093174b8e4f9b56f096bc2cb5e26584dfae89e7.tar.gz
src/spinner/Makefile.am: missing \ at end of lines breaks jhbuild
When building adwaita-icon-themes with jhbuild (master; on Ubuntu 14.04), the build fails with make[2]: Entering directory `/home/pietro/jhbuild/checkout/adwaita-icon-theme/src/spinner' for file in ; do \ size='scalable-up-to-32' /bin/bash: -c: line 2: syntax error: unexpected end of file make[2]: *** [render-png] Error 1 make[2]: git.mk: Generating .gitignore *** Waiting for unfinished jobs.... make[2]: Leaving directory `/home/pietro/jhbuild/checkout/adwaita-icon-theme/src/spinner' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/pietro/jhbuild/checkout/adwaita-icon-theme/src' make: *** [all-recursive] Error 1 *** Error during phase build of adwaita-icon-theme: ########## Error running make -j 3 *** [29/29] The problem is obvious: a line (actually two) of the Makefile.am is/are missing \ at the end. The attached patch will fix the issue. https://bugzilla.gnome.org/show_bug.cgi?id=734456
-rw-r--r--src/spinner/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
index 86cd85fa6..f45398e5c 100644
--- a/src/spinner/Makefile.am
+++ b/src/spinner/Makefile.am
@@ -4,8 +4,8 @@ icon_in_files = $(shell SRCDIR="$(srcdir)"; for i in `find $$SRCDIR -name "*.svg
if ALLOW_RENDERING
render-png: $(icon_in_files) Makefile
for file in $(icon_in_files); do \
- size='scalable-up-to-32'
- $(ICONTOOL_RENDER) -s $$size -o $(top_builddir)/$(SVGOUTDIR) $$file >/dev/null;
+ size='scalable-up-to-32' \
+ $(ICONTOOL_RENDER) -s $$size -o $(top_builddir)/$(SVGOUTDIR) $$file >/dev/null; \
done
else